diff options
Diffstat (limited to 'app/views/groups/merge_requests.html.haml')
| -rw-r--r-- | app/views/groups/merge_requests.html.haml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 92f6c896e7b..8d858ad72d2 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -4,16 +4,19 @@ - add_page_specific_style 'page_bundles/issuable_list' .top-area - = render 'shared/issuable/nav', type: :merge_requests + = render 'shared/issuable/nav', type: :merge_requests, display_count: !@search_timeout_occurred - if current_user .nav-controls - if @can_bulk_update = render_if_exists 'projects/merge_requests/bulk_update_button' - = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _("merge request"), type: :merge_requests, with_feature_enabled: 'merge_requests', with_shared: false, include_projects_in_subgroups: true + = render 'shared/new_project_item_vue_select' = render 'shared/issuable/search_bar', type: :merge_requests - if @can_bulk_update = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :merge_requests -= render 'shared/merge_requests' +- if @search_timeout_occurred + = render 'shared/dashboard/search_timeout_occurred' +- else + = render 'shared/merge_requests' |