Commit e8ec1722 authored by Thomas Randolph's avatar Thomas Randolph Committed by Vitaly Slobodin

Move the merge train helper icon to near the merge button

Changelog: other
parent 95f81a81
...@@ -598,13 +598,12 @@ export default { ...@@ -598,13 +598,12 @@ export default {
@cancel="isPipelineFailedModalVisible = false" @cancel="isPipelineFailedModalVisible = false"
/> />
</gl-button-group> </gl-button-group>
<merge-train-helper-icon v-if="shouldRenderMergeTrainHelperIcon" class="gl-mx-3" />
<div <div
v-if="shouldShowMergeControls" v-if="shouldShowMergeControls"
:class="{ 'gl-w-full gl-order-n1 gl-mb-5': glFeatures.restructuredMrWidget }" :class="{ 'gl-w-full gl-order-n1 gl-mb-5': glFeatures.restructuredMrWidget }"
class="gl-display-flex gl-align-items-center gl-flex-wrap" class="gl-display-flex gl-align-items-center gl-flex-wrap"
> >
<merge-train-helper-icon v-if="shouldRenderMergeTrainHelperIcon" class="gl-mx-3" />
<gl-form-checkbox <gl-form-checkbox
v-if="canRemoveSourceBranch" v-if="canRemoveSourceBranch"
id="remove-source-branch-input" id="remove-source-branch-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