Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue
index 9262a4e1e95..5455a034106 100644
--- a/app/assets/javascripts/import_entities/components/import_status.vue
+++ b/app/assets/javascripts/import_entities/components/import_status.vue
@@ -44,6 +44,11 @@ const STATUS_MAP = {
     text: __('Failed'),
     variant: 'danger',
   },
+  [STATUSES.TIMEOUT]: {
+    icon: 'status-failed',
+    text: __('Timeout'),
+    variant: 'danger',
+  },
   [STATUSES.CANCELLED]: {
     icon: 'status-stopped',
     text: __('Cancelled'),
diff --git a/app/assets/javascripts/import_entities/constants.js b/app/assets/javascripts/import_entities/constants.js
index 20a4d2d84b4..c470da21765 100644
--- a/app/assets/javascripts/import_entities/constants.js
+++ b/app/assets/javascripts/import_entities/constants.js
@@ -10,4 +10,5 @@ export const STATUSES = {
   NONE: 'none',
   SCHEDULING: 'scheduling',
   CANCELLED: 'cancelled',
+  TIMEOUT: 'timeout',
 };
diff --git a/app/assets/javascripts/import_entities/import_groups/utils.js b/app/assets/javascripts/import_entities/import_groups/utils.js
index 1d0ab75e1cb..f896203ba60 100644
--- a/app/assets/javascripts/import_entities/import_groups/utils.js
+++ b/app/assets/javascripts/import_entities/import_groups/utils.js
@@ -10,7 +10,7 @@ export function getInvalidNameValidationMessage(importTarget) {
 }
 
 export function isFinished(group) {
-  return [STATUSES.FINISHED, STATUSES.FAILED].includes(group.progress?.status);
+  return [STATUSES.FINISHED, STATUSES.FAILED, STATUSES.TIMEOUT].includes(group.progress?.status);
 }
 
 export function isAvailableForImport(group) {