diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-09-07 16:21:30 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-09-07 16:21:30 +0300 |
commit | e5e0acfc4dd65503b89e652beca5b973141c4032 (patch) | |
tree | 3123b4f7b9fbde403b417417d452f78f9db0eb25 /app/views/projects/merge_requests/index.html.haml | |
parent | 83c1bb688c9fff5c146dcc5fb74fe74c1d948d34 (diff) | |
parent | 62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf (diff) |
Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into 37158-autodevops-banner
Diffstat (limited to 'app/views/projects/merge_requests/index.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index fae6f34b062..2c53891a92d 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -12,9 +12,6 @@ = webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'filtered_search' -- 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' - if @project.merge_requests.exists? @@ -23,7 +20,7 @@ = render 'shared/auto_devops_callout' .top-area = render 'shared/issuable/nav', type: :merge_requests - .nav-controls.visible-xs + .nav-controls = 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 |