Make “merge immediately” modal conditional

dea7dc50 · Pedro Moreira da Silva · pedroms · 464a19ab · dea7dc50
Commit dea7dc50 authored Oct 12, 2020 by Pedro Moreira da Silva Committed by pedroms Oct 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue ...merge_request_widget/components/states/ready_to_merge.vue +5 -5

No files found.
--- 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
@@ -329,13 +329,13 @@ export default {
              >
                {{ __('Merge immediately') }}
              </gl-dropdown-item>
+              <merge-immediately-confirmation-dialog
+                ref="confirmationDialog"
+                :docs-url="mr.mergeImmediatelyDocsPath"
+                @mergeImmediately="onMergeImmediatelyConfirmation"
+              />
            </gl-dropdown>
          </gl-button-group>
-          <merge-immediately-confirmation-dialog
-            ref="confirmationDialog"
-            :docs-url="mr.mergeImmediatelyDocsPath"
-            @mergeImmediately="onMergeImmediatelyConfirmation"
-          />
          <div class="media-body-wrap space-children">
            <template v-if="shouldShowMergeControls">
              <label v-if="mr.canRemoveSourceBranch">