Commit f82d0d8d58d93ce335b499c007f838fcd1e7fe0f
Exists in
spb-stable
and in
2 other branches
Merge pull request #6940 from skv-headless/mr-diff-note-scroll-fix
fix link to notes in merge request diff
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
app/views/projects/merge_requests/_show.html.haml
| @@ -26,11 +26,11 @@ | @@ -26,11 +26,11 @@ | ||
| 26 | - if @merge_request.closed? | 26 | - if @merge_request.closed? |
| 27 | = 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" | 27 | = 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" |
| 28 | 28 | ||
| 29 | - .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" } | ||
| 30 | - = render "projects/notes/notes_with_form" | ||
| 31 | .diffs.tab-content | 29 | .diffs.tab-content |
| 32 | - if current_page?(action: 'diffs') | 30 | - if current_page?(action: 'diffs') |
| 33 | = render "projects/merge_requests/show/diffs" | 31 | = render "projects/merge_requests/show/diffs" |
| 32 | + .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" } | ||
| 33 | + = render "projects/notes/notes_with_form" | ||
| 34 | .status | 34 | .status |
| 35 | 35 | ||
| 36 | :javascript | 36 | :javascript |