diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-16 18:16:50 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-16 18:16:50 +0000 |
| commit | a4fa44ce90565c93b65b730d9d400e4b4b49ee4d (patch) | |
| tree | 1e4037ac6fbb543a207826a61383590b095e1449 /app/views/projects/merge_requests/_show.html.haml | |
| parent | 5174b7ad7e4b90761467388a29fa016d77e7a16d (diff) | |
| parent | 195c10574e110a0ced395fbee5cd5e546fb9e7fc (diff) | |
| download | gitlab-ce-a4fa44ce90565c93b65b730d9d400e4b4b49ee4d.tar.gz | |
Merge branch 'master' into 'docs/change-docs-reviewers'
# Conflicts:
# doc/development/doc_styleguide.md
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
| -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 |