diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-03 12:51:35 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-03 12:51:35 +0100 |
| commit | 6184197fb0b2a741616b5a7802bb16daf12bd7a4 (patch) | |
| tree | ec293e443036e072a11a73ba6f4fc2df9aef9c8d /app/views/groups/merge_requests.html.haml | |
| parent | 08a0af9fcf4de2ae1f56c46104eb0ae171db38df (diff) | |
| download | gitlab-ce-6184197fb0b2a741616b5a7802bb16daf12bd7a4.tar.gz | |
more action button movements
fixed eslint failures
fixed project select dropdown not working on some pages
Diffstat (limited to 'app/views/groups/merge_requests.html.haml')
| -rw-r--r-- | app/views/groups/merge_requests.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 45e39252e16..997c82c77d9 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -1,12 +1,16 @@ - page_title "Merge Requests" +- if show_new_nav? && current_user + - content_for :breadcrumbs_extra do + = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request" + - if @group_merge_requests.empty? = render 'shared/empty_states/merge_requests', project_select_button: true - else .top-area = render 'shared/issuable/nav', type: :merge_requests - if current_user - .nav-controls + .nav-controls{ class: ("visible-xs" if show_new_nav?) } = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request" = render 'shared/issuable/filter', type: :merge_requests |