gitlab_reviewable 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bead66298dbcddaf653475c5ef2a17b7d84003ef
|
4
|
+
data.tar.gz: 3d887f87e7b025c720b8391f0fc80e0cb53d4d12
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e09ef5ea0307c44700093302e8fdcc141475b291185c04d377c5781d999676a85d9765053ba130c51388a29ef70a60ed4cb236d763f2e42bf53be676a648d203
|
7
|
+
data.tar.gz: e337872f765350d0a6b8c8a9542985b95f6c96ba7e66e51702273a7facd9b357ebf0e985e560637a24638d685e41c698587e76984e386abe70e27c20497baf1a
|
@@ -8,10 +8,9 @@ module GitlabReviewable
|
|
8
8
|
layout 'review'
|
9
9
|
|
10
10
|
def diffs
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
11
|
+
# @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
|
12
|
+
# group(:commit_id).count
|
13
|
+
|
15
14
|
respond_to do |format|
|
16
15
|
format.html
|
17
16
|
end
|
@@ -36,8 +35,8 @@ module GitlabReviewable
|
|
36
35
|
def define_show_vars
|
37
36
|
# Build a note object for comment form
|
38
37
|
@note = @project.notes.new(noteable: @merge_request)
|
39
|
-
@notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
|
40
38
|
@discussions = @notes.discussions
|
39
|
+
@notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
|
41
40
|
@noteable = @merge_request
|
42
41
|
|
43
42
|
# Get commits from repository
|
@@ -54,5 +53,24 @@ module GitlabReviewable
|
|
54
53
|
@merge_request.close
|
55
54
|
end
|
56
55
|
end
|
56
|
+
|
57
|
+
def prepare_notes_for_rendering(notes)
|
58
|
+
preload_noteable_for_regular_notes(notes)
|
59
|
+
preload_max_access_for_authors(notes, @project)
|
60
|
+
Banzai::NoteRenderer.render(notes, @project, current_user)
|
61
|
+
|
62
|
+
notes
|
63
|
+
end
|
64
|
+
|
65
|
+
def preload_max_access_for_authors(notes, project)
|
66
|
+
return nil unless project
|
67
|
+
|
68
|
+
user_ids = notes.map(&:author_id)
|
69
|
+
project.team.max_member_access_for_user_ids(user_ids)
|
70
|
+
end
|
71
|
+
|
72
|
+
def preload_noteable_for_regular_notes(notes)
|
73
|
+
ActiveRecord::Associations::Preloader.new.preload(notes.reject(&:for_commit?), :noteable)
|
74
|
+
end
|
57
75
|
end
|
58
76
|
end
|
@@ -10,7 +10,7 @@
|
|
10
10
|
%li.notes-tab
|
11
11
|
= link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
|
12
12
|
Discussion
|
13
|
-
%span.badge= @merge_request.
|
13
|
+
%span.badge= @merge_request.related_notes.user.count
|
14
14
|
|
15
15
|
.tab-content
|
16
16
|
#notes.notes.tab-pane.voting_notes
|
@@ -2,14 +2,10 @@
|
|
2
2
|
%html{ lang: "en"}
|
3
3
|
= render "layouts/head"
|
4
4
|
- if current_user
|
5
|
-
%body{class:
|
5
|
+
%body{class: @body_class, 'data-page' => body_data_page}
|
6
6
|
-# Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body.
|
7
|
-
- project = @
|
8
|
-
|
9
|
-
- markdown_preview_path = namespace_project_wikis_markdown_preview_path(project.namespace, project)
|
10
|
-
- else
|
11
|
-
- markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project)
|
12
|
-
- if current_user
|
7
|
+
- project = @project
|
8
|
+
- if current_user
|
13
9
|
:javascript
|
14
10
|
window.project_uploads_path = "#{namespace_project_uploads_path project.namespace,project}";
|
15
11
|
window.markdown_preview_path = "#{markdown_preview_path}";
|
data/config/routes.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gitlab_reviewable
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- lenghan
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-08-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|