Skip to content
Snippets Groups Projects
Verified Commit 3bf1a715 authored by Phil Hughes's avatar Phil Hughes
Browse files

Fixes auto merge state showing in widget

This fixes a bug where sometimes the auto merge state would show
incorrectly.
parent 07554c52
No related branches found
No related tags found
2 merge requests!144312Change service start (cut-off) date for code suggestions to March 15th,!142797Fixes auto merge state showing in widget
......@@ -268,11 +268,6 @@ export default {
)
);
},
autoMergeStateVisible() {
if (!window.gon?.features?.mergeBlockedComponent) return false;
return this.mr.state === 'autoMergeEnabled' || this.mr.machineValue === 'AUTO_MERGE';
},
},
watch: {
'mr.machineValue': {
......@@ -581,13 +576,15 @@ export default {
</div>
<div class="mr-widget-section" data-testid="mr-widget-content">
<mr-widget-auto-merge-enabled
v-if="autoMergeStateVisible"
:mr="mr"
:service="service"
class="gl-border-b-1 gl-border-b-solid gl-border-gray-100"
/>
<merge-checks v-if="mergeBlockedComponentEnabled" :mr="mr" :service="service" />
<template v-if="mergeBlockedComponentEnabled">
<mr-widget-auto-merge-enabled
v-if="mr.autoMergeEnabled"
:mr="mr"
:service="service"
class="gl-border-b-1 gl-border-b-solid gl-border-gray-100"
/>
<merge-checks :mr="mr" :service="service" />
</template>
<component :is="componentName" v-else :mr="mr" :service="service" />
<ready-to-merge
v-if="mr.commitsCount"
......
......@@ -39,7 +39,7 @@ export default function deviseState() {
return stateKey.shaMismatch;
}
if (this.autoMergeEnabled && !this.mergeError) {
return stateKey.autoMergeEnabled;
return window.gon?.features?.mergeBlockedComponent ? null : stateKey.autoMergeEnabled;
}
if (
this.detailedMergeStatus === DETAILED_MERGE_STATUS.MERGEABLE ||
......
......@@ -277,13 +277,15 @@ export default {
<blocking-merge-requests-report :mr="mr" />
<div class="mr-widget-section">
<mr-widget-auto-merge-enabled
v-if="autoMergeStateVisible"
:mr="mr"
:service="service"
class="gl-border-b-1 gl-border-b-solid gl-border-gray-100"
/>
<merge-checks v-if="mergeBlockedComponentEnabled" :mr="mr" :service="service" />
<template v-if="mergeBlockedComponentEnabled">
<mr-widget-auto-merge-enabled
v-if="mr.autoMergeEnabled"
:mr="mr"
:service="service"
class="gl-border-b-1 gl-border-b-solid gl-border-gray-100"
/>
<merge-checks :mr="mr" :service="service" />
</template>
<component :is="componentName" v-else :mr="mr" :service="service" />
<ready-to-merge
v-if="mr.commitsCount"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment