From 3f5eea56a56d0b989d3c29731ff72333ae3f337f Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Fri, 8 Sep 2017 09:21:19 +1000
Subject: correctly format boolean props

Don't use standard attribute names
---
 .../vue_merge_request_widget/components/mr_widget_status_icon.js    | 4 ++--
 .../components/states/mr_widget_archived.js                         | 5 ++++-
 .../components/states/mr_widget_auto_merge_failed.js                | 5 ++++-
 .../components/states/mr_widget_conflicts.js                        | 6 +++++-
 .../components/states/mr_widget_missing_branch.js                   | 6 +++++-
 .../components/states/mr_widget_pipeline_blocked.js                 | 6 +++++-
 .../components/states/mr_widget_pipeline_failed.js                  | 6 +++++-
 .../components/states/mr_widget_sha_mismatch.js                     | 6 +++++-
 .../components/states/mr_widget_unresolved_discussions.js           | 6 +++++-
 .../vue_merge_request_widget/components/states/mr_widget_wip.js     | 6 +++++-
 10 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
index e0e3ab0e5ab..cfa29b97f5b 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
@@ -4,7 +4,7 @@ import loadingIcon from '../../vue_shared/components/loading_icon.vue';
 export default {
   props: {
     status: { type: String, required: true },
-    disabled: { type: Boolean, required: false },
+    iconDisabled: { type: Boolean, required: false },
     showDisabledButton: { type: Boolean, required: false },
   },
   components: {
@@ -14,7 +14,7 @@ export default {
   computed: {
     statusObj() {
       return {
-        group: this.disabled ? 'disabled' : this.status,
+        group: this.iconDisabled ? 'disabled' : this.status,
         icon: `icon_status_${this.status}`,
       };
     },
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.js
index 9b1a2f638d4..b25f8519c0a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.js
@@ -8,7 +8,10 @@ export default {
   template: `
     <div class="mr-widget-body media">
       <div class="space-children">
-        <status-icon status="warning" disabled="true" />
+        <status-icon
+          status="warning"
+          :icon-disabled="true"
+        />
         <button
           type="button"
           class="btn btn-success btn-small"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
index 00f27f64022..e5ceb2bf14a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
@@ -24,7 +24,10 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+      />
       <div class="media-body space-children">
         <span class="bold">
           <template v-if="mr.mergeError">{{mr.mergeError}}.</template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
index 8f6d7e6e977..c4167dad9c5 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
@@ -10,7 +10,11 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" showDisabledButton />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+        showDisabledButton
+      />
       <div class="media-body space-children">
         <span class="bold">
           There are merge conflicts<span v-if="!mr.canMerge">.</span>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
index 1be35dbf483..d21614c241a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
@@ -24,7 +24,11 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" showDisabledButton />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+        showDisabledButton
+      />
       <div class="media-body space-children">
         <span class="bold js-branch-text">
           <span class="capitalize">
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
index 90109a38ccb..2cbf2f1221c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
@@ -7,7 +7,11 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" showDisabledButton />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+        showDisabledButton
+      />
       <div class="media-body space-children">
         <span class="bold">
           Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
index 399d93aec5d..727b4904b09 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
@@ -7,7 +7,11 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" showDisabledButton />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+        showDisabledButton
+      />
       <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
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
index a9c8cd65319..1f008a95a08 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
@@ -7,7 +7,11 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" showDisabledButton />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+        showDisabledButton
+      />
       <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
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
index 26b4ac98c7c..9e89ae3f832 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
@@ -10,7 +10,11 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" showDisabledButton />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+        showDisabledButton
+      />
       <div class="media-body space-children">
         <span class="bold">
           There are unresolved discussions. Please resolve these discussions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
index 06812293221..1875494984c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
@@ -38,7 +38,11 @@ export default {
   },
   template: `
     <div class="mr-widget-body media">
-      <status-icon status="warning" disabled="true" :showDisabledButton="Boolean(mr.removeWIPPath)" />
+      <status-icon
+        status="warning"
+        :icon-disabled="true"
+        :showDisabledButton="Boolean(mr.removeWIPPath)"
+      />
       <div class="media-body space-children">
         <span class="bold">
           This is a Work in Progress
-- 
cgit v1.2.1