diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-14 13:55:07 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-09-14 19:08:29 +0200 |
| commit | 8ecaa256f80342a6424f5e4e0c46bcc729f876e6 (patch) | |
| tree | c51dbaab3bb0d5d6d7f4804430f2703a1e50dffc /app/views/discussions | |
| parent | bf6f9f34e9052eca8bce238ae91e7d7172b216eb (diff) | |
| download | gitlab-ce-8ecaa256f80342a6424f5e4e0c46bcc729f876e6.tar.gz | |
Style merge request diff dropdowns & disable comments.
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_jump_to_next.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/discussions/_jump_to_next.html.haml b/app/views/discussions/_jump_to_next.html.haml index 69bd416c4de..1e41b54be38 100644 --- a/app/views/discussions/_jump_to_next.html.haml +++ b/app/views/discussions/_jump_to_next.html.haml @@ -1,3 +1,5 @@ +-if @merge_request_diff + - comments_disabled = @merge_request_diff.latest? && !!@start_sha - discussion = local_assigns.fetch(:discussion, nil) - if current_user %jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" } @@ -5,5 +7,6 @@ %button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion", title: "Jump to next unresolved discussion", "aria-label" => "Jump to next unresolved discussion", - data: { container: "body" } } + data: { container: "body" }, + disabled: comments_disabled } = custom_icon("next_discussion") |