Commit b46b67ed authored by Mike Greiling's avatar Mike Greiling Committed by Sean McGivern

include merge option checkboxes in the same form group

parent 3846d1ec
......@@ -20,18 +20,16 @@
 
= link_to 'Change branches', mr_change_branches_path(issuable)
- if issuable.can_remove_source_branch?(current_user)
.form-group
.col-sm-10.col-sm-offset-2
.form-group
.col-sm-10.col-sm-offset-2
- if issuable.can_remove_source_branch?(current_user)
.checkbox
= label_tag 'merge_request[force_remove_source_branch]' do
= hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
= check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?
Remove source branch when merge request is accepted.
- if issuable.new_record?
.form-group
.col-sm-10.col-sm-offset-2
- if issuable.new_record?
.checkbox
= label_tag 'merge_request[squash]' do
= check_box_tag 'merge_request[squash]', nil
......
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