diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-21 07:05:02 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-21 07:08:34 -0800 |
| commit | 4c4c8532d0710689cca2a3c71b134665d42e839a (patch) | |
| tree | 6c093d981d1ee9595a9004c1ded90ad19bd8248d /app/services | |
| parent | ac6673ddcfda0a0229b86f22543d31ddccc1dc55 (diff) | |
| download | gitlab-ce-4c4c8532d0710689cca2a3c71b134665d42e839a.tar.gz | |
Handle force_remove_source_branch when creating merge requestsh-fix-issue-51220
Creating a merge request with
`merge_request[force_remove_source_branch]` parameter would result in an
Error 500 since this attribute was passed directly to the merge request.
Fix this by properly parsing this attribute into `merge_params`.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51220
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 6c69452e2ab..36767621d74 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -10,6 +10,7 @@ module MergeRequests # TODO: this should handle all quick actions that don't have side effects # https://gitlab.com/gitlab-org/gitlab-ce/issues/53658 merge_quick_actions_into_params!(merge_request, only: [:target_branch]) + merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) if params.has_key?(:force_remove_source_branch) merge_request.assign_attributes(params) merge_request.author = current_user |