diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-13 13:19:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-17 14:10:21 +0200 |
| commit | ab92551bbd98c5f51cb3aa8073f8dc108b19ceea (patch) | |
| tree | fcbfc0394f34f561587f4f0f8982d5c41fb408af /app | |
| parent | 70b24e49938fcf5fde3dde3b38ec0b9f941eebef (diff) | |
| download | gitlab-ce-ab92551bbd98c5f51cb3aa8073f8dc108b19ceea.tar.gz | |
Merge branch '23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master'
Maintain "force_remove_source_branch" options on Merge Request unless specified
Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge
* Closes #23234
* Closes #23191
* Closes #19351
See merge request !6817
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index f14f9e4b327..0c158bf4477 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -15,7 +15,9 @@ module MergeRequests params.except!(:target_branch, :force_remove_source_branch) end - merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) + if params[:force_remove_source_branch].present? + merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) + end update(merge_request) end |