diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-06-29 18:41:09 -0400 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-07-02 12:08:10 -0400 |
| commit | da18378fa7c52d5f08494024e7dda90701534d6a (patch) | |
| tree | 13c2d6188bd5738667b18e169e147cf56b61fdeb | |
| parent | e48f54b5b23b4b865a4462151d576d2ff09d543e (diff) | |
| download | gitlab-ce-32885-unintentionally-removing-branch-when-merging-merge-request.tar.gz | |
Set force_remove_source_branch default to false.32885-unintentionally-removing-branch-when-merging-merge-request
| -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 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. 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: |