diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-06 10:58:24 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-06 10:58:24 +0000 |
| commit | ddb3692a2218e97dfcc256e21a0fccc97c5d9a56 (patch) | |
| tree | aabb5e0b0d6f37ee068a8804ccef46b994d4afba /app/views/projects/merge_requests | |
| parent | f497f170697c838747bb7cdaca2d1939f843a00c (diff) | |
| download | gitlab-ce-ddb3692a2218e97dfcc256e21a0fccc97c5d9a56.tar.gz | |
Clean up new navigation templates
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index c020e7db380..27c3002366b 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -12,9 +12,8 @@ = webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'filtered_search' -- if show_new_nav? - - content_for :breadcrumbs_extra do - = render "projects/merge_requests/nav_btns", merge_project: merge_project, new_merge_request_path: new_merge_request_path +- content_for :breadcrumbs_extra do + = render "projects/merge_requests/nav_btns", merge_project: merge_project, new_merge_request_path: new_merge_request_path = render 'projects/last_push' @@ -22,7 +21,7 @@ %div{ class: container_class } .top-area = render 'shared/issuable/nav', type: :merge_requests - .nav-controls{ class: ("visible-xs" if show_new_nav?) } + .nav-controls.visible-xs = render "projects/merge_requests/nav_btns", merge_project: merge_project, new_merge_request_path: new_merge_request_path = render 'shared/issuable/search_bar', type: :merge_requests |