diff options
author | Jeroen Jacobs <git@jeroenj.be> | 2016-02-12 21:41:31 +0100 |
---|---|---|
committer | Jeroen Jacobs <git@jeroenj.be> | 2016-05-20 11:30:03 +0200 |
commit | 7880a300dc9ef3fcceb7f1a6af6a6500b0b46e5c (patch) | |
tree | 3aac27ae9ecedf438cd36356985ea4ca02c21153 /app/services/merge_requests/update_service.rb | |
parent | f26389a02a48a53cccb3bb7dd1d7bcd4858c118d (diff) | |
download | gitlab-ce-7880a300dc9ef3fcceb7f1a6af6a6500b0b46e5c.tar.gz |
Allows MR authors to have the source branch removed when merging the MR
Diffstat (limited to 'app/services/merge_requests/update_service.rb')
-rw-r--r-- | app/services/merge_requests/update_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 477c64e7377..026a37997d4 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -11,6 +11,8 @@ module MergeRequests params.except!(:target_project_id) params.except!(:source_branch) + merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) + update(merge_request) end |