Move EE differences for `app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue`
The file app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
has differences between CE and EE.
Diferences
diff --git a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index b8f29649eb5..399c3bad4e7 100644
--- a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -100,6 +100,7 @@ export default {
!commitMessage.length ||
!this.shouldShowMergeControls() ||
this.isMakingRequest ||
+ this.isApprovalNeeded ||
this.mr.preventMerge,
);
},
@@ -110,6 +111,9 @@ export default {
const { commitsCount, enableSquashBeforeMerge } = this.mr;
return enableSquashBeforeMerge && commitsCount > 1;
},
+ isApprovalNeeded() {
+ return this.mr.approvalsRequired ? !this.mr.isApproved : false;
+ },
},
methods: {
shouldShowMergeControls() {
What needs to be done
- Create an EE mixin & a CE counterpart & use ee_else_ce