Commit d5745c66 authored by Frederic Caplette's avatar Frederic Caplette

Fix first round of review

Add 2 updates after Payton's
review of this MR.
parent 1d96b8fa
......@@ -67,7 +67,7 @@ export default {
return (this.hasCi && !this.ciStatus) || this.hasPipelineMustSucceedConflict;
},
hasPipelineMustSucceedConflict() {
return !this.hasCi && Boolean(this.pipelineMustSucceed);
return !this.hasCi && this.pipelineMustSucceed;
},
status() {
return this.pipeline.details && this.pipeline.details.status
......
......@@ -326,10 +326,7 @@ export default {
</li>
</ul>
</span>
<div
class="media-body-wrap"
:class="{ 'space-children': !hasPipelineMustSucceedConflict }"
>
<div class="media-body-wrap space-children">
<template v-if="shouldShowMergeControls">
<label v-if="mr.canRemoveSourceBranch">
<input
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment