include merge option checkboxes in the same form group

b46b67ed · Mike Greiling · Sean McGivern · 3846d1ec · b46b67ed
Commit b46b67ed authored Jan 05, 2017 by Mike Greiling Committed by Sean McGivern Feb 01, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

app/views/shared/issuable/form/_branch_chooser.html.haml app/views/shared/issuable/form/_branch_chooser.html.haml +4 -6

No files found.
--- a/app/views/shared/issuable/form/_branch_chooser.html.haml
+++ b/app/views/shared/issuable/form/_branch_chooser.html.haml
@@ -20,18 +20,16 @@
      &nbsp;
      = link_to 'Change branches', mr_change_branches_path(issuable)
- if issuable.can_remove_source_branch?(current_user)
+.form-group
-  .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?
+    - if issuable.new_record?
-  .form-group
-    .col-sm-10.col-sm-offset-2
      .checkbox
        = label_tag 'merge_request[squash]' do
          = check_box_tag 'merge_request[squash]', nil