summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-05-24 05:31:50 +0000
committerMike Greiling <mike@pixelcog.com>2018-05-24 05:31:50 +0000
commitc52db71e36ee70c4c5be80b029cf4362f28e3667 (patch)
treef74649e6ce527b40a7b9ceef6be6c27336fa6ec3 /app
parent6c51e220ef2774447038a909c4f22ff90eb624fb (diff)
parent7af283c74d6bc36d2d3a963ddc4b831e9e1e8a98 (diff)
downloadgitlab-ce-c52db71e36ee70c4c5be80b029cf4362f28e3667.tar.gz
Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'
Resolve "Escape key to close MR check out branch modal" Closes #45850 See merge request gitlab-org/gitlab-ce!19050
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/merge_requests/_how_to_merge.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_how_to_merge.html.haml b/app/views/projects/merge_requests/_how_to_merge.html.haml
index 54a661040ea..779034fa173 100644
--- a/app/views/projects/merge_requests/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/_how_to_merge.html.haml
@@ -1,4 +1,4 @@
-#modal_merge_info.modal
+#modal_merge_info.modal{ tabindex: '-1' }
.modal-dialog
.modal-content
.modal-header