diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-21 16:01:16 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-09-22 11:07:39 +0200 |
| commit | f4f6f92ce8d5dc89da22c3e82a50580453ea8f76 (patch) | |
| tree | ea1b5ccb947ea52f244cebadf7111ba7a57a9bf8 | |
| parent | 8e4b849974b79e3571d91bd91cecacc09747a7a0 (diff) | |
| download | gitlab-ce-bpj-merge-request-diff-fixes.tar.gz | |
Stop disabling jump_to_next buttons, when not on latest MR diff.bpj-merge-request-diff-fixes
| -rw-r--r-- | app/views/discussions/_jump_to_next.html.haml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/discussions/_jump_to_next.html.haml b/app/views/discussions/_jump_to_next.html.haml index da970792b4d..7ed09dd1a98 100644 --- a/app/views/discussions/_jump_to_next.html.haml +++ b/app/views/discussions/_jump_to_next.html.haml @@ -1,4 +1,3 @@ -- 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)}'" } @@ -6,6 +5,5 @@ %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" }, - disabled: diff_notes_disabled } + data: { container: "body" }} = custom_icon("next_discussion") |