From bbede1e22c4dd615042a3e9c0d7e24afc83ca377 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 26 Nov 2020 09:09:53 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../components/mr_widget_how_to_merge_modal.vue                   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/assets/javascripts/vue_merge_request_widget')

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
index 957356eab27..531a7dbaac0 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
@@ -94,7 +94,13 @@ export default {
 </script>
 
 <template>
-  <gl-modal modal-id="modal-merge-info" :title="$options.i18n.title" no-fade hide-footer>
+  <gl-modal
+    modal-id="modal-merge-info"
+    :no-enforce-focus="true"
+    :title="$options.i18n.title"
+    no-fade
+    hide-footer
+  >
     <p>
       <strong>
         {{ $options.i18n.steps.step1.label }}
-- 
cgit v1.2.1