summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
index eef49e20159..40e6203599f 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
@@ -1,5 +1,7 @@
import { __ } from '~/locale';
+export const MERGE_DISABLED_TEXT = __('You can only merge once the items above are resolved.');
+
export default {
computed: {
isMergeButtonDisabled() {
@@ -11,6 +13,9 @@ export default {
this.mr.preventMerge,
);
},
+ mergeDisabledText() {
+ return MERGE_DISABLED_TEXT;
+ },
autoMergeText() {
// MWPS is currently the only auto merge strategy available in CE
return __('Merge when pipeline succeeds');