diff options
Diffstat (limited to 'app/views/dashboard/merge_requests.html.haml')
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index c921375edd1..712f987a783 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -10,14 +10,16 @@ - if current_user .page-title-controls.ml-0.mb-3.ml-sm-auto.mb-sm-0 - = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _("merge request"), with_feature_enabled: 'merge_requests', type: :merge_requests + = render 'shared/new_project_item_vue_select' .top-area - = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set + = render 'shared/issuable/nav', type: :merge_requests, display_count: !(@no_filters_set || @search_timeout_occurred) = render 'shared/issuable/search_bar', type: :merge_requests, disable_target_branch: true - if current_user && @no_filters_set = render 'shared/dashboard/no_filter_selected' +- elsif @search_timeout_occurred + = render 'shared/dashboard/search_timeout_occurred' - else = render 'shared/merge_requests' |