Commit fd72b4ed authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch '32885-unintentionally-removing-branch-when-merging-merge-request' into 'master'

Set default for "Remove source branch" to false

Closes #32885

See merge request !12576
parents 8cb19818 da18378f
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
.col-sm-10.col-sm-offset-2 .col-sm-10.col-sm-offset-2
- if issuable.can_remove_source_branch?(current_user) - if issuable.can_remove_source_branch?(current_user)
.checkbox .checkbox
- initial_checkbox_value = issuable.merge_params.key?('force_remove_source_branch') ? issuable.force_remove_source_branch? : true
= label_tag 'merge_request[force_remove_source_branch]' do = label_tag 'merge_request[force_remove_source_branch]' do
= hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
= check_box_tag 'merge_request[force_remove_source_branch]', '1', initial_checkbox_value = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?
Remove source branch when merge request is accepted. Remove source branch when merge request is accepted.
---
title: Set default for Remove source branch to false.
merge_request: !12576
author:
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