diff options
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.js | 6 |
1 files changed, 1 insertions, 5 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 10a54c73273..2f49252a06b 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 @@ -31,10 +31,6 @@ export default { pipelineMustSucceedConflictText() { return PIPELINE_MUST_SUCCEED_CONFLICT_TEXT; }, - autoMergeTextLegacy() { - // MWPS is currently the only auto merge strategy available in CE - return __('Merge when pipeline succeeds'); - }, autoMergeText() { return __('Set to auto-merge'); }, @@ -51,7 +47,7 @@ export default { }; }, shouldShowMergeImmediatelyDropdown() { - return this.isPipelineActive && !this.stateData.onlyAllowMergeIfPipelineSucceeds; + return this.isPipelineActive && !this.state.onlyAllowMergeIfPipelineSucceeds; }, isMergeImmediatelyDangerous() { return false; |