diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-25 15:11:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-25 15:11:32 +0300 |
| commit | 975eac49924cf0e9c980d970458d14d2ddaa8b55 (patch) | |
| tree | fc54fae4690daef41f2e44391fb659c7a4ea82f2 /app/assets/javascripts/vue_merge_request_widget/stores | |
| parent | 326b4d3216d107b40142ee847c06f2c41a1ef220 (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 | 2 |
1 files changed, 1 insertions, 1 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 04800cf43f0..afd5f766095 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 @@ -25,7 +25,7 @@ export default function deviseState() { return stateKey.shaMismatch; } else if (this.autoMergeEnabled && !this.mergeError) { return stateKey.autoMergeEnabled; - } else if (!this.canMerge) { + } else if (!this.canMerge && !window.gon?.features?.restructuredMrWidget) { return stateKey.notAllowedToMerge; } else if (this.canBeMerged) { return stateKey.readyToMerge; |