kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Fix bootstrap squash checkbox alignment

Closes #47055

See merge request gitlab-org/gitlab-ce!19292
This commit is contained in:
Annabel Gray 2018-05-31 20:39:27 +00:00
parent ccf9e52e89 698f954e69
commit e16859c4e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/shared/issuable/form/_merge_params.html.haml
View File

@ -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'