gitlab_reviewable 0.0.7 → 0.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/gitlab_reviewable/reviews_controller.rb +2 -5
- data/app/views/gitlab_reviewable/reviews/diffs.html.haml +2 -2
- data/app/views/gitlab_reviewable/reviews/discussion.html.haml +2 -2
- data/app/views/layouts/review.haml +2 -3
- data/lib/gitlab_reviewable/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 41c7bd17cb00f2ab4e48b7cb9564aab8d8de0425
|
|
4
|
+
data.tar.gz: 80132edd445d61a156ea35a9a34828274654a2bf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0f7f29a65048d2fdfc6ade8a88ec698b5e345f21c9730693cac8bcbb2a5863b2ba8227da940aa4b216c7302c60ecb64e75dd120a1175d06a387088770d8b0fad
|
|
7
|
+
data.tar.gz: 4cd63fa7a923f59bf7c1c904ef58f4795f939b7afa49d9e0058e91f2566de8fe02007d7c7b5a147aecb9fb06caa6f5e6bb1c25eb5eb22e89cc0b164df8d85d78
|
|
@@ -35,7 +35,7 @@ module GitlabReviewable
|
|
|
35
35
|
def define_show_vars
|
|
36
36
|
# Build a note object for comment form
|
|
37
37
|
@note = @project.notes.new(noteable: @merge_request)
|
|
38
|
-
@discussions = @
|
|
38
|
+
@discussions = @merge_request.discussions
|
|
39
39
|
@notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
|
|
40
40
|
@noteable = @merge_request
|
|
41
41
|
|
|
@@ -45,15 +45,12 @@ module GitlabReviewable
|
|
|
45
45
|
|
|
46
46
|
@merge_request_diff = @merge_request.merge_request_diff
|
|
47
47
|
|
|
48
|
-
@ci_commit = @merge_request.ci_commit
|
|
49
|
-
@statuses = @ci_commit.statuses if @ci_commit
|
|
50
|
-
|
|
51
48
|
if @merge_request.locked_long_ago?
|
|
52
49
|
@merge_request.unlock_mr
|
|
53
50
|
@merge_request.close
|
|
54
51
|
end
|
|
55
52
|
end
|
|
56
|
-
|
|
53
|
+
|
|
57
54
|
def prepare_notes_for_rendering(notes)
|
|
58
55
|
preload_noteable_for_regular_notes(notes)
|
|
59
56
|
preload_max_access_for_authors(notes, @project)
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
%section.col-md-12
|
|
21
21
|
.issuable-discussion
|
|
22
22
|
%ul#notes-list.notes.main-notes-list.timeline
|
|
23
|
-
= render "
|
|
23
|
+
= render "shared/notes/notes"
|
|
24
24
|
%ul.notes.notes-form.timeline
|
|
25
25
|
%li.timeline-entry
|
|
26
26
|
- if can? current_user, :create_note, @project
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
%a.author_link{ href: user_path(current_user) }
|
|
29
29
|
= image_tag avatar_icon(current_user), alt: current_user.to_reference, class: 'avatar s40'
|
|
30
30
|
.timeline-content.timeline-content-form
|
|
31
|
-
= render "
|
|
31
|
+
= render "shared/notes/form", view: diff_view
|
|
32
32
|
- else
|
|
33
33
|
.disabled-comment.text-center
|
|
34
34
|
.disabled-comment-text.inline
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
%section.col-md-12
|
|
19
19
|
.issuable-discussion
|
|
20
20
|
%ul#notes-list.notes.main-notes-list.timeline
|
|
21
|
-
= render "
|
|
21
|
+
= render "shared/notes/notes"
|
|
22
22
|
%ul.notes.notes-form.timeline
|
|
23
23
|
%li.timeline-entry
|
|
24
24
|
- if can? current_user, :create_note, @project
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
%a.author_link{ href: user_path(current_user) }
|
|
27
27
|
= image_tag avatar_icon(current_user), alt: current_user.to_reference, class: 'avatar s40'
|
|
28
28
|
.timeline-content.timeline-content-form
|
|
29
|
-
= render "
|
|
29
|
+
= render "shared/notes/form", view: diff_view
|
|
30
30
|
- else
|
|
31
31
|
.disabled-comment.text-center
|
|
32
32
|
.disabled-comment-text.inline
|
|
@@ -8,18 +8,17 @@
|
|
|
8
8
|
- if current_user
|
|
9
9
|
:javascript
|
|
10
10
|
window.project_uploads_path = "#{namespace_project_uploads_path project.namespace,project}";
|
|
11
|
-
window.markdown_preview_path = "#{markdown_preview_path}";
|
|
12
11
|
|
|
13
12
|
.page-with-sidebar
|
|
14
13
|
- if defined?(nav) && nav
|
|
15
14
|
.layout-nav
|
|
16
15
|
.container-fluid
|
|
17
16
|
= render "layouts/nav/#{nav}"
|
|
18
|
-
.content-wrapper{ class:
|
|
17
|
+
.content-wrapper{ class: layout_nav_class }
|
|
19
18
|
= render "layouts/broadcast"
|
|
20
19
|
= render "layouts/flash"
|
|
21
20
|
= yield :flash_message
|
|
22
|
-
%div{ class: (container_class unless @no_container) }
|
|
21
|
+
%div{ class: "#{(container_class unless @no_container)} #{@content_class}" }
|
|
23
22
|
.content
|
|
24
23
|
.clearfix
|
|
25
24
|
= yield
|