Commit ebc6128a authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch 'tor/maintenance/move-help-icon-to-merge-button' into 'master'

Move Merge Train help icon to be near merge button

See merge request gitlab-org/gitlab!78525
parents 95f81a81 e8ec1722
......@@ -598,13 +598,12 @@ export default {
@cancel="isPipelineFailedModalVisible = false"
/>
</gl-button-group>
<merge-train-helper-icon v-if="shouldRenderMergeTrainHelperIcon" class="gl-mx-3" />
<div
v-if="shouldShowMergeControls"
:class="{ 'gl-w-full gl-order-n1 gl-mb-5': glFeatures.restructuredMrWidget }"
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
v-if="canRemoveSourceBranch"
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