diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-31 20:39:27 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-31 20:39:27 +0000 |
| commit | e16859c4e71a291b42db78178b274ce028ff41db (patch) | |
| tree | a3643779b4c3cd6e199873520fd233b65939b036 | |
| parent | ccf9e52e8993e71956479281a3039282099f6e88 (diff) | |
| parent | 698f954e69a295392749c38afbd530e0d7dc11b5 (diff) | |
| download | gitlab-ce-e16859c4e71a291b42db78178b274ce028ff41db.tar.gz | |
Merge branch 'bootstrap-squash-alignment' into 'master'
Fix bootstrap squash checkbox alignment
Closes #47055
See merge request gitlab-org/gitlab-ce!19292
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index 44564f8a3e0..1bcdddd0df0 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -16,8 +16,8 @@ = label_tag 'merge_request[force_remove_source_branch]', class: 'form-check-label' do Remove source branch when merge request is accepted. -.form-group - .col-sm-10.col-sm-offset-2 +.form-group.row + .col-sm-10.offset-sm-2 .form-check = hidden_field_tag 'merge_request[squash]', '0', id: nil = check_box_tag 'merge_request[squash]', '1', issuable.squash, class: 'form-check-input' |