diff --git a/app/assets/javascripts/merge_requests/list/components/empty_state.vue b/app/assets/javascripts/merge_requests/list/components/empty_state.vue
index 13ce5437532859efe0d0e1be97d131e8b0ed49ae..1ece7863d8cca0d4cf07b42cc3854767e54d0e6a 100644
--- a/app/assets/javascripts/merge_requests/list/components/empty_state.vue
+++ b/app/assets/javascripts/merge_requests/list/components/empty_state.vue
@@ -30,9 +30,18 @@ export default {
required: false,
default: true,
},
+ searchTimeout: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
},
computed: {
title() {
+ if (this.searchTimeout) {
+ return __('Too many results to display');
+ }
+
if (this.hasSearch) {
return __('No results found');
}
@@ -48,6 +57,10 @@ export default {
return __('There are no closed merge requests');
},
description() {
+ if (this.searchTimeout) {
+ return __('Edit your search or add a filter.');
+ }
+
if (this.hasSearch) {
return __('To widen your search, change or remove filters above.');
}
@@ -77,7 +90,7 @@ export default {
>
+
+
+
+
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
index 361b1fef538bcbbb97b5e04ae8eb5ff157f364fe..66d685f34a6a765d0c17d0311039a2a586ffca23 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
@@ -230,6 +230,11 @@ export default {
required: false,
default: () => [],
},
+ searchTimeout: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
},
data() {
return {
@@ -359,7 +364,7 @@ export default {
+
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3a813b2503e25b4a1b45c9e503f6ec4d28d6db71..d2242250c2f01c39708978c03dd17241d92d54dc 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -25699,6 +25699,9 @@ msgstr ""
msgid "Edit your search filter and try again."
msgstr ""
+msgid "Edit your search or add a filter."
+msgstr ""
+
msgid "Edit, lint, and visualize your pipeline."
msgstr ""
@@ -68875,6 +68878,9 @@ msgstr ""
msgid "Too many references. Quick actions are limited to at most %{max_count} user references"
msgstr ""
+msgid "Too many results to display"
+msgstr ""
+
msgid "Too many results to display. Edit your search or add a filter."
msgstr ""