diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-04 15:10:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-04 15:10:22 +0300 |
commit | eef37e3313a4f3413633d043e08d85020246ed5e (patch) | |
tree | fdd0834ef6c46343af13137e1aa49fd8faf9a69c /app/assets/javascripts/vue_merge_request_widget/stores | |
parent | 191020103bd4d2aad99c62a35201c05d9df74f8f (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 | 6 |
1 files changed, 3 insertions, 3 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 65d78fc283c..d52371032eb 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 @@ -1,14 +1,14 @@ import { stateKey } from './state_maps'; export default function deviseState() { - if (this.hasMergeChecksFailed) { + if (!this.commitsCount) { + return stateKey.nothingToMerge; + } else if (this.hasMergeChecksFailed && !this.autoMergeEnabled) { return stateKey.mergeChecksFailed; } else if (this.projectArchived) { return stateKey.archived; } else if (this.branchMissing) { return stateKey.missingBranch; - } else if (!this.commitsCount) { - return stateKey.nothingToMerge; } else if (this.mergeStatus === 'unchecked' || this.mergeStatus === 'checking') { return stateKey.checking; } else if (this.hasConflicts) { |