summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-08-27 15:47:57 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-08-27 15:47:57 +0000
commit881ba3f5977dafda7feee77f841ace290c918a8d (patch)
treeb40d0dca3ce0dd16029474e277796c57208ae331
parent4a5c70bffa88942dec3366c87dfd55803a8c848e (diff)
parent1c54a7906489d8d6ee512dce1bd6a4622b36b7bb (diff)
downloadgitlab-ce-881ba3f5977dafda7feee77f841ace290c918a8d.tar.gz
Merge branch '43625-increase-modal-checkout' into 'master'
Resolve "Size of checkout branch modal box is too small" Closes #43625 See merge request gitlab-org/gitlab-ce!21381
-rw-r--r--app/views/projects/merge_requests/_how_to_merge.html.haml2
-rw-r--r--changelogs/unreleased/43625-increase-modal-checkout.yml5
2 files changed, 6 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 62dd21ef6e0..d3871453b9f 100644
--- a/app/views/projects/merge_requests/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/_how_to_merge.html.haml
@@ -1,5 +1,5 @@
#modal_merge_info.modal{ tabindex: '-1' }
- .modal-dialog
+ .modal-dialog.modal-lg
.modal-content
.modal-header
%h3.modal-title Check out, review, and merge locally
diff --git a/changelogs/unreleased/43625-increase-modal-checkout.yml b/changelogs/unreleased/43625-increase-modal-checkout.yml
new file mode 100644
index 00000000000..877550924c1
--- /dev/null
+++ b/changelogs/unreleased/43625-increase-modal-checkout.yml
@@ -0,0 +1,5 @@
+---
+title: Increase width of checkout branch modal box
+merge_request:
+author:
+type: fixed