From 8ecaa256f80342a6424f5e4e0c46bcc729f876e6 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Wed, 14 Sep 2016 13:55:07 +0200 Subject: Style merge request diff dropdowns & disable comments. --- app/views/discussions/_jump_to_next.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/views/discussions') 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") -- cgit v1.2.1