diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-03 21:36:49 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-04 21:50:20 +0300 |
| commit | dbc496077101fa93a4d814be74d126ef6865554f (patch) | |
| tree | 42bf2c9f78096f0b5cdbd2e42e27f96e89251918 | |
| parent | 146991b6e12dd06da15de06b77630589e4659ca0 (diff) | |
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
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml | 4 |
2 files changed, 5 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 271150ed318..03309722326 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -10,8 +10,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. diff --git a/changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml b/changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml new file mode 100644 index 00000000000..313aeab91b5 --- /dev/null +++ b/changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml @@ -0,0 +1,4 @@ +--- +title: Set default for Remove source branch to false. +merge_request: !12576 +author: |