diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-11 15:25:19 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-11 15:25:19 +0400 |
| commit | f82d0d8d58d93ce335b499c007f838fcd1e7fe0f (patch) | |
| tree | bd51ce040ec0abd0d3992fc058bee8b151a80a2f /app | |
| parent | bf941ce9acc046af1717fe2b7d9464fa484e3a10 (diff) | |
| parent | c8e6752414010fadeb4516a3d860719666ac7212 (diff) | |
Merge pull request #6940 from skv-headless/mr-diff-note-scroll-fix
fix link to notes in merge request diff
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 1072728af28..486454793ba 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -26,11 +26,11 @@ - if @merge_request.closed? = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request" - .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" } - = render "projects/notes/notes_with_form" .diffs.tab-content - if current_page?(action: 'diffs') = render "projects/merge_requests/show/diffs" + .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" } + = render "projects/notes/notes_with_form" .status :javascript |