diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js')
-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 3bd512c89bf..9d3f4eb01ed 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 @@ -17,7 +17,7 @@ export default function deviseState() { return stateKey.pipelineFailed; } else if (this.workInProgress) { return stateKey.workInProgress; - } else if (this.hasMergeableDiscussionsState) { + } else if (this.hasMergeableDiscussionsState && !this.autoMergeEnabled) { return stateKey.unresolvedDiscussions; } else if (this.isPipelineBlocked) { return stateKey.pipelineBlocked; |