gitlab_reviewable 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c097cb78accd58c52f9cb149ff9d9901d58a72
-  data.tar.gz: 4230d90a33faa853d62e00e0d31ed120e4fbb922
+  metadata.gz: bead66298dbcddaf653475c5ef2a17b7d84003ef
+  data.tar.gz: 3d887f87e7b025c720b8391f0fc80e0cb53d4d12
 SHA512:
-  metadata.gz: 8048c167127987d6765dae7348e13e5a888515316d8c99b2f3197b05e14fd8b131313e2973ee4b442f4e8f2826682879d9c6abdc63536e6291f175aa80b61098
-  data.tar.gz: fc8e50cba6e8baa63190b634d8340611b9ef534ed7f68ab2e58c26dad77214bf4c844b04320603fdace2ba29e31fc111227e5302eb1709831f5583c03f92baba
+  metadata.gz: e09ef5ea0307c44700093302e8fdcc141475b291185c04d377c5781d999676a85d9765053ba130c51388a29ef70a60ed4cb236d763f2e42bf53be676a648d203
+  data.tar.gz: e337872f765350d0a6b8c8a9542985b95f6c96ba7e66e51702273a7facd9b357ebf0e985e560637a24638d685e41c698587e76984e386abe70e27c20497baf1a

data/app/controllers/gitlab_reviewable/reviews_controller.rb

@@ -8,10 +8,9 @@ module GitlabReviewable
     layout 'review'
 
     def diffs
-      puts 111111
-      @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
-        group(:commit_id).count
-
+      # @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
+      #   group(:commit_id).count
+      
       respond_to do |format|
         format.html
       end
@@ -36,8 +35,8 @@ module GitlabReviewable
     def define_show_vars
       # Build a note object for comment form
       @note = @project.notes.new(noteable: @merge_request)
-      @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
       @discussions = @notes.discussions
+      @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
       @noteable = @merge_request
 
       # Get commits from repository
@@ -54,5 +53,24 @@ module GitlabReviewable
         @merge_request.close
       end
     end
+    
+    def prepare_notes_for_rendering(notes)
+      preload_noteable_for_regular_notes(notes)
+      preload_max_access_for_authors(notes, @project)
+      Banzai::NoteRenderer.render(notes, @project, current_user)
+
+      notes
+    end
+
+    def preload_max_access_for_authors(notes, project)
+      return nil unless project
+
+      user_ids = notes.map(&:author_id)
+      project.team.max_member_access_for_user_ids(user_ids)
+    end
+
+    def preload_noteable_for_regular_notes(notes)
+      ActiveRecord::Associations::Preloader.new.preload(notes.reject(&:for_commit?), :noteable)
+    end
   end
 end

data/app/views/gitlab_reviewable/reviews/discussion.html.haml

@@ -10,7 +10,7 @@
       %li.notes-tab
         = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
           Discussion
-          %span.badge= @merge_request.mr_and_commit_notes.user.nonawards.count
+          %span.badge= @merge_request.related_notes.user.count
 
     .tab-content
       #notes.notes.tab-pane.voting_notes

data/app/views/layouts/review.haml

@@ -2,14 +2,10 @@
 %html{ lang: "en"}
   = render "layouts/head"
   - if current_user
-    %body{class: "#{user_application_theme}", 'data-page' => body_data_page}
+    %body{class: @body_class, 'data-page' => body_data_page}
       -# Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body.
-      - project = @target_project || @project
-      - if @project_wiki
-        - markdown_preview_path = namespace_project_wikis_markdown_preview_path(project.namespace, project)
-      - else
-        - markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project)
-      - if current_user
+      - project = @project
+        - if current_user
         :javascript
           window.project_uploads_path = "#{namespace_project_uploads_path project.namespace,project}";
           window.markdown_preview_path = "#{markdown_preview_path}";

data/config/routes.rb

@@ -1,5 +1,4 @@
 GitlabReviewable::Engine.routes.draw do
 	get 'diffs' => 'reviews#diffs'
 	get 'discussion' => 'reviews#discussion'
-	get 'help/shortcuts'
 end

data/lib/gitlab_reviewable/version.rb

@@ -1,3 +1,3 @@
 module GitlabReviewable
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_reviewable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - lenghan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails