Commit 80d75bd9 authored by Phil Hughes's avatar Phil Hughes

Merge branch 're-position-merge-train-help-icon' into 'master'

Re-position merge train help icon

See merge request gitlab-org/gitlab!73184
parents e8068b2c 00cd1f2e
...@@ -557,6 +557,14 @@ export default { ...@@ -557,6 +557,14 @@ export default {
v-if="shouldShowMergeControls" v-if="shouldShowMergeControls"
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"
:merge-train-when-pipeline-succeeds-docs-path="
mr.mergeTrainWhenPipelineSucceedsDocsPath
"
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"
...@@ -575,13 +583,6 @@ export default { ...@@ -575,13 +583,6 @@ export default {
:is-disabled="isSquashReadOnly" :is-disabled="isSquashReadOnly"
class="gl-mx-3" class="gl-mx-3"
/> />
<merge-train-helper-icon
v-if="shouldRenderMergeTrainHelperIcon"
:merge-train-when-pipeline-succeeds-docs-path="
mr.mergeTrainWhenPipelineSucceedsDocsPath
"
/>
</div> </div>
<template v-else> <template v-else>
<div class="bold js-resolve-mr-widget-items-message gl-ml-3"> <div class="bold js-resolve-mr-widget-items-message gl-ml-3">
......
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