Merge branch '4133-icons-for-approvals-remaining-and-approvals-met' into 'master'

Resolve "Icons for approvals remaining and approvals met"

Closes #4133

See merge request gitlab-org/gitlab-ee!3669

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.js

@@ -8,7 +8,7 @@ export default {
   template: `
     <div class="mr-widget-body media">
       <div class="space-children">
-        <status-icon status="failed" />
+        <status-icon status="warning" />
         <button
           type="button"
           class="btn btn-success btn-sm"

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js

@@ -24,7 +24,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" />
+      <status-icon status="warning" />
       <div class="media-body space-children">
         <span class="bold">
           <template v-if="mr.mergeError">{{mr.mergeError}}.</template>

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js

@@ -12,7 +12,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" />
+      <status-icon status="warning" />
       <div class="media-body">
         <mr-widget-author-and-time
           actionText="Closed by"

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js

@@ -11,7 +11,7 @@ export default {
   template: `
     <div class="mr-widget-body media">
       <status-icon
-        status="failed"
+        status="warning"
         :show-disabled-button="true" />
       <div class="media-body space-children">
         <span

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js

@@ -51,7 +51,7 @@ export default {
         </span>
       </template>
       <template v-else>
-        <status-icon status="failed" :show-disabled-button="true" />
+        <status-icon status="warning" :show-disabled-button="true" />
         <div class="media-body space-children">
           <span class="bold">
             <span

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js

@@ -24,7 +24,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" :show-disabled-button="true" />
+      <status-icon status="warning" :show-disabled-button="true" />
       <div class="media-body space-children">
         <span class="bold js-branch-text">
           <span class="capitalize">

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js

@@ -7,7 +7,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" :show-disabled-button="true" />
+      <status-icon status="warning" :show-disabled-button="true" />
       <div class="media-body space-children">
         <span class="bold">
           Pipeline blocked. The pipeline for this merge request requires a manual action to proceed

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js

@@ -7,7 +7,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" :show-disabled-button="true" />
+      <status-icon status="warning" :show-disabled-button="true" />
       <div class="media-body space-children">
         <span class="bold">
           The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js

@@ -68,7 +68,7 @@ export default {
     },
     iconClass() {
       if (this.status === 'failed' || !this.commitMessage.length || !this.mr.isMergeAllowed || this.mr.preventMerge) {
-        return 'failed';
+        return 'warning';
       }
       return 'success';
     },

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js

@@ -7,7 +7,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" :show-disabled-button="true" />
+      <status-icon status="warning" :show-disabled-button="true" />
       <div class="media-body space-children">
         <span class="bold">
           The source branch HEAD has recently changed. Please reload the page and review the changes before merging

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js

@@ -10,7 +10,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" :show-disabled-button="true" />
+      <status-icon status="warning" :show-disabled-button="true" />
       <div class="media-body space-children">
         <span class="bold">
           There are unresolved discussions. Please resolve these discussions

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js

@@ -37,7 +37,7 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="failed" :show-disabled-button="Boolean(mr.removeWIPPath)" />
+      <status-icon status="warning" :show-disabled-button="Boolean(mr.removeWIPPath)" />
       <div class="media-body space-children">
         <span class="bold">
           This is a Work in Progress

changelogs/unreleased-ee/4133-icons-for-approvals-remaining-and-approvals-met.yml

+---
+title: Change MR widget failed icons to warning icons
+merge_request: 3669
+author:
+type: changed

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/mr_widget_approvals.js

@@ -28,7 +28,7 @@ export default {
   computed: {
     status() {
       if (this.mr.approvals.approvals_left > 0) {
-        return 'failed';
+        return 'warning';
       }
       return 'success';
     },

ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue

@@ -32,7 +32,7 @@
           return 'loading';
         }
         if (!this.mr.canPushToSourceBranch && !this.mr.rebaseInProgress) {
-          return 'failed';
+          return 'warning';
         }
         return 'success';
       },

ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_secondary_geo_node.js

@@ -12,7 +12,7 @@ export default {
   },
   template: `
     <div class="media">
-      <status-icon status="failed" showDisabledButton />
+      <status-icon status="warning" showDisabledButton />
       <div class="media-body">
         <span class="bold">
           Merge requests are read-only in a secondary Geo node

spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js

@@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => {
         expect(vm.iconClass).toEqual('success');
       });
 
-      it('shows x for failed status', () => {
+      it('shows warning icon for failed status', () => {
         vm.mr.hasCI = true;
-        expect(vm.iconClass).toEqual('failed');
+        expect(vm.iconClass).toEqual('warning');
       });
 
-      it('shows x for merge not allowed', () => {
+      it('shows warning icon for merge not allowed', () => {
         vm.mr.hasCI = true;
-        expect(vm.iconClass).toEqual('failed');
+        expect(vm.iconClass).toEqual('warning');
       });
     });