diff options
| author | Jeroen Jacobs <git@jeroenj.be> | 2016-02-12 23:41:31 +0300 |
|---|---|---|
| committer | Jeroen Jacobs <git@jeroenj.be> | 2016-05-20 12:30:03 +0300 |
| commit | 7880a300dc9ef3fcceb7f1a6af6a6500b0b46e5c (patch) | |
| tree | 3aac27ae9ecedf438cd36356985ea4ca02c21153 /app/views/shared/issuable | |
| parent | f26389a02a48a53cccb3bb7dd1d7bcd4858c118d (diff) | |
Allows MR authors to have the source branch removed when merging the MR
Diffstat (limited to 'app/views/shared/issuable')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 5c52cc6d1da..1181edec3f9 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -114,6 +114,13 @@ - if @merge_request.new_record? = link_to 'Change branches', mr_change_branches_path(@merge_request) + - if @merge_request.can_remove_source_branch?(current_user) + .form-group + .col-sm-10.col-sm-offset-2 + .checkbox + = label_tag 'merge_request[force_remove_source_branch]' do + = check_box_tag 'merge_request[force_remove_source_branch]', '1', @merge_request.force_remove_source_branch? + Remove source branch when merge request is accepted. - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?) .row-content-block{class: (is_footer ? "footer-block" : "middle-block")} |