diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-03 15:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-03 15:09:42 +0300 |
| commit | 6b3944a90167998424f6f258dcffcd4ec740ef03 (patch) | |
| tree | 52be4c90a768d55655631d1b8058bced792813ce /app/assets/javascripts/vue_merge_request_widget/stores | |
| parent | 42d930072f05883b7b1b0cc060c175912ea942dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js index 9d3f4eb01ed..04800cf43f0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js @@ -23,8 +23,8 @@ export default function deviseState() { return stateKey.pipelineBlocked; } else if (this.canMerge && this.isSHAMismatch) { return stateKey.shaMismatch; - } else if (this.autoMergeEnabled) { - return this.mergeError ? stateKey.autoMergeFailed : stateKey.autoMergeEnabled; + } else if (this.autoMergeEnabled && !this.mergeError) { + return stateKey.autoMergeEnabled; } else if (!this.canMerge) { return stateKey.notAllowedToMerge; } else if (this.canBeMerged) { |