diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-14 20:57:21 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-14 20:57:21 +0000 |
| commit | 05762f449e7620015923eedcbacde8cec1eabf52 (patch) | |
| tree | e6f974821883cb34a0b3595e22d6e664331d7833 /app/views/projects/merge_requests | |
| parent | ecb1aea14694ed15010af694a58e8e37be808509 (diff) | |
| parent | 517895da4c1ca6201f952e443a579e4f2845e6e0 (diff) | |
| download | gitlab-ce-05762f449e7620015923eedcbacde8cec1eabf52.tar.gz | |
Merge branch 'mr-tabs-affix' into 'master'
Merge request tabs stick when scrolling page
## What does this MR do?
When scrolling merge requests this sticks the tabs to below the navigation for easy access.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #20548
See merge request !6382
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 47dd51639b5..662463bc72b 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{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') } %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 |