Re-add form-check

33b787ee · Clement Ho · 3d283810 · 33b787ee
Commit 33b787ee authored May 24, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

app/views/shared/issuable/form/_merge_params.html.haml app/views/shared/issuable/form/_merge_params.html.haml +5 -4

No files found.
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -10,7 +10,8 @@
 .form-group.row
  .col-sm-10.offset-sm-2
    - if issuable.can_remove_source_branch?(current_user)
-      = label_tag 'merge_request[force_remove_source_branch]' do
+      .form-check
-        = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
+        = label_tag 'merge_request[force_remove_source_branch]' do
-        = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?
+          = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
-        Remove source branch when merge request is accepted.
+          = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?
+          Remove source branch when merge request is accepted.