diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-03 18:36:49 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-03 18:36:49 +0000 |
| commit | fd72b4eda1f0d7d3591a6db8163633efaa3f1955 (patch) | |
| tree | 9d5d467982bef7f50648ceed771effc8a96d80b0 /app/views/shared | |
| parent | 8cb198180e4b706125452a08bc55b7edbf2a29de (diff) | |
| parent | da18378fa7c52d5f08494024e7dda90701534d6a (diff) | |
| download | gitlab-ce-fd72b4eda1f0d7d3591a6db8163633efaa3f1955.tar.gz | |
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
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index bfa91629e1e..8f6509a8ce8 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -11,8 +11,7 @@ .col-sm-10.col-sm-offset-2 - if issuable.can_remove_source_branch?(current_user) .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 = 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. |