diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-16 10:45:23 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-06 10:17:34 +0100 |
| commit | c65ea7a5c30ee44c859ac711f1054dab734bdb89 (patch) | |
| tree | 10a987b981d63f4c22edc1f4df5b49373ed76642 /app/views/projects/merge_requests | |
| parent | 0ddeb6eb53d8fe6030e9945650f7594e2861dbf8 (diff) | |
| download | gitlab-ce-c65ea7a5c30ee44c859ac711f1054dab734bdb89.tar.gz | |
Merge request tabs stick when scrolling page
Closes #20548
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 9f34ca9ff4e..351c9d6ff91 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -47,7 +47,7 @@ = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" - if @commits_count.nonzero? - %ul.merge-request-tabs.nav-links.no-top.no-bottom + %ul.merge-request-tabs.nav-links.no-top.no-bottom.js-tabs-affix %li.notes-tab = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#notes', action: 'notes', toggle: 'tab' } do Discussion |