Skip to content
Snippets Groups Projects

Fix Approval UI showing up for free plan

Merged Mark Chao requested to merge 9908-hide-approver-ui-in-free into master
All threads resolved!
Files
17
@@ -112,7 +112,7 @@ export default {
@@ -112,7 +112,7 @@ export default {
return enableSquashBeforeMerge && commitsCount > 1;
return enableSquashBeforeMerge && commitsCount > 1;
},
},
isApprovalNeeded() {
isApprovalNeeded() {
return this.mr.approvalsRequired ? !this.mr.isApproved : false;
return this.mr.hasApprovalsAvailable ? !this.mr.isApproved : false;
},
},
shouldShowMergeControls() {
shouldShowMergeControls() {
return this.mr.isMergeAllowed || this.shouldShowMergeWhenPipelineSucceedsText;
return this.mr.isMergeAllowed || this.shouldShowMergeWhenPipelineSucceedsText;
Loading