diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-15 11:00:32 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-09-15 11:00:32 +0200 |
| commit | c887f837f35e96e934031b9457f1020ce923167a (patch) | |
| tree | b527d2cd0ee2937719f8ee2dad6b46ff37f95a21 /app/views/discussions | |
| parent | a306cda7160950e56ed803f0a88049f025d4cad0 (diff) | |
| download | gitlab-ce-c887f837f35e96e934031b9457f1020ce923167a.tar.gz | |
Switch out comments_disabled for diff_notes_disabled.
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_jump_to_next.html.haml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/discussions/_jump_to_next.html.haml b/app/views/discussions/_jump_to_next.html.haml index 1e41b54be38..da970792b4d 100644 --- a/app/views/discussions/_jump_to_next.html.haml +++ b/app/views/discussions/_jump_to_next.html.haml @@ -1,5 +1,4 @@ --if @merge_request_diff - - comments_disabled = @merge_request_diff.latest? && !!@start_sha +- diff_notes_disabled = (@merge_request_diff.latest? && !!@start_sha) if @merge_request_diff - discussion = local_assigns.fetch(:discussion, nil) - if current_user %jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" } @@ -8,5 +7,5 @@ title: "Jump to next unresolved discussion", "aria-label" => "Jump to next unresolved discussion", data: { container: "body" }, - disabled: comments_disabled } + disabled: diff_notes_disabled } = custom_icon("next_discussion") |