diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-21 09:16:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-21 09:16:05 +0000 |
| commit | ac6f9f98b49e622cf3d6fd1ebb747e58c5d691bf (patch) | |
| tree | 90ca7dc3d479aca95e45ee84084c8c10ba3951aa /app/assets/javascripts/vue_merge_request_widget | |
| parent | d6f8c107c914fbbb849261b7ceaf456647a8ea7d (diff) | |
| download | gitlab-ce-ac6f9f98b49e622cf3d6fd1ebb747e58c5d691bf.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index 06ce312bd4c..daed8840c73 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -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" |