diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 09:09:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 09:09:53 +0000 |
| commit | bbede1e22c4dd615042a3e9c0d7e24afc83ca377 (patch) | |
| tree | 3126821f7bea0509a1f6daaa0f6d592248d13e7e /app/assets/javascripts/vue_merge_request_widget | |
| parent | f8bb64721a58ed2fa5a8dceb3743c99fb379ea57 (diff) | |
| download | gitlab-ce-bbede1e22c4dd615042a3e9c0d7e24afc83ca377.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/mr_widget_how_to_merge_modal.vue | 8 |
1 files changed, 7 insertions, 1 deletions
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 }} |