Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 12 deletions

diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue
index fb47e261f3e..db677c574d1 100644
--- a/app/assets/javascripts/import_entities/components/import_status.vue
+++ b/app/assets/javascripts/import_entities/components/import_status.vue
@@ -101,18 +101,17 @@ export default {
     mappedStatus() {
       if (this.status === STATUSES.FINISHED) {
         const isIncomplete = this.stats && isIncompleteImport(this.stats);
-        return {
-          icon: 'status-success',
-          ...(isIncomplete
-            ? {
-                text: __('Partial import'),
-                variant: 'warning',
-              }
-            : {
-                text: __('Complete'),
-                variant: 'success',
-              }),
-        };
+        return isIncomplete
+          ? {
+              icon: 'status-alert',
+              text: __('Partial import'),
+              variant: 'warning',
+            }
+          : {
+              icon: 'status-success',
+              text: __('Complete'),
+              variant: 'success',
+            };
       }
 
       return STATUS_MAP[this.status];
@@ -128,6 +127,8 @@ export default {
         return { name: 'status-success', class: 'gl-text-green-400' };
       } else if (imported === 0) {
         return { name: 'status-scheduled', class: 'gl-text-gray-400' };
+      } else if (this.status === STATUSES.FINISHED) {
+        return { name: 'status-alert', class: 'gl-text-orange-400' };
       }
 
       return { name: 'status-running', class: 'gl-text-blue-400' };