From b94a26ad15f760a5e70f951747c1341e64e77119 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 3 Oct 2017 19:22:04 -0500 Subject: Use explicit boolean true attribute for show-disabled-button Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38417 --- .../vue_merge_request_widget/components/states/mr_widget_checking.js | 2 +- .../vue_merge_request_widget/components/states/mr_widget_conflicts.js | 2 +- .../components/states/mr_widget_failed_to_merge.js | 2 +- .../components/states/mr_widget_missing_branch.js | 2 +- .../vue_merge_request_widget/components/states/mr_widget_not_allowed.js | 2 +- .../components/states/mr_widget_pipeline_blocked.js | 2 +- .../components/states/mr_widget_pipeline_failed.js | 2 +- .../components/states/mr_widget_sha_mismatch.js | 2 +- .../components/states/mr_widget_unresolved_discussions.js | 2 +- .../vue_merge_request_widget/components/states/mr_widget_wip.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js index aaf9d3304a4..09561694939 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js @@ -7,7 +7,7 @@ export default { }, template: `
- +
Checking ability to merge automatically 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 dc252f8a9b7..5d468a085cb 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 @@ -12,7 +12,7 @@ export default {
+ :show-disabled-button="true" />