BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit e16859c4 by Annabel Gray
Options

Merge branch 'bootstrap-squash-alignment' into 'master'

Fix bootstrap squash checkbox alignment Closes #47055 See merge request gitlab-org/gitlab-ce!19292
parents ccf9e52e 698f954e
Showing with 2 additions and 2 deletions
app/views/shared/issuable/form/_merge_params.html.haml
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
= label_tag 'merge_request[force_remove_source_branch]', class: 'form-check-label' do = label_tag 'merge_request[force_remove_source_branch]', class: 'form-check-label' do
Remove source branch when merge request is accepted. Remove source branch when merge request is accepted.
.form-group .form-group.row
.col-sm-10.col-sm-offset-2 .col-sm-10.offset-sm-2
.form-check .form-check
= hidden_field_tag 'merge_request[squash]', '0', id: nil = hidden_field_tag 'merge_request[squash]', '0', id: nil
= check_box_tag 'merge_request[squash]', '1', issuable.squash, class: 'form-check-input' = check_box_tag 'merge_request[squash]', '1', issuable.squash, class: 'form-check-input'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment