diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-07 18:22:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-07 18:22:51 +0300 |
commit | 14184b159db309ff0d1b5ec5926bfb2f33dbbc70 (patch) | |
tree | 14544825057af942733b0fb722f435025271de7e /app/assets/javascripts/vue_merge_request_widget/components | |
parent | e8e22b384c97899e6944eeb85a0a2b84e8615f9c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue | 7 |
1 files changed, 0 insertions, 7 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 bc094501e89..239529ed8f6 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 @@ -295,13 +295,6 @@ export default { return enableSquashBeforeMerge; }, - shouldShowMergeControls() { - if (this.glFeatures.restructuredMrWidget) { - return this.restructuredWidgetShowMergeButtons; - } - - return this.isMergeAllowed || this.isAutoMergeAvailable; - }, shouldShowSquashEdit() { return this.squashBeforeMerge && this.shouldShowSquashBeforeMerge; }, |