Merge branch '10099-ee-differences-for-ready-to-merge' into 'master'

Move EE differences for `ready_to_merge.vue`

See merge request gitlab-org/gitlab-ce!27587

2 files changed, 15 insertions, 9 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index bb76eb1030d..851939d5d4e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -3,6 +3,7 @@ import successSvg from 'icons/_icon_status_success.svg';
 import warningSvg from 'icons/_icon_status_warning.svg';
 import simplePoll from '~/lib/utils/simple_poll';
 import { __ } from '~/locale';
+import readyToMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/ready_to_merge';
 import MergeRequest from '../../../merge_request';
 import Flash from '../../../flash';
 import statusIcon from '../mr_widget_status_icon.vue';
@@ -21,6 +22,7 @@ export default {
     CommitEdit,
     CommitMessageDropdown,
   },
+  mixins: [readyToMergeMixin],
   props: {
     mr: { type: Object, required: true },
     service: { type: Object, required: true },
@@ -94,15 +96,6 @@ export default {
     shouldShowMergeOptionsDropdown() {
       return this.mr.isPipelineActive && !this.mr.onlyAllowMergeIfPipelineSucceeds;
     },
-    isMergeButtonDisabled() {
-      const { commitMessage } = this;
-      return Boolean(
-        !commitMessage.length ||
-          !this.shouldShowMergeControls ||
-          this.isMakingRequest ||
-          this.mr.preventMerge,
-      );
-    },
     isRemoveSourceBranchButtonDisabled() {
       return this.isMergeButtonDisabled;
     },
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
new file mode 100644
index 00000000000..b2e64506472
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
@@ -0,0 +1,13 @@
+export default {
+  computed: {
+    isMergeButtonDisabled() {
+      const { commitMessage } = this;
+      return Boolean(
+        !commitMessage.length ||
+          !this.shouldShowMergeControls ||
+          this.isMakingRequest ||
+          this.mr.preventMerge,
+      );
+    },
+  },
+};