diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-15 20:55:45 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-15 21:27:33 +0300 |
| commit | d3fa9c9539aac42844a297a99ef56254ce1c06a3 (patch) | |
| tree | ba94fe9d979a003585ede0c8f499030c731fa3f1 /app/services/merge_requests | |
| parent | 1a50801cd0801d3134b41e96ff2a6b27a96a1047 (diff) | |
Fix remove_source_branch merge request API handling
Users attempting to set merge requests to `remove_source_branch` to
`false` would encounter an Error 500 because the UpdateService and API
checked `present?`, which would always return `false`. We now just
use `has_key?` to decide whether the parameter is present.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60530
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index faaa4d66726..55546432ce4 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -16,7 +16,7 @@ module MergeRequests params.delete(:force_remove_source_branch) end - if params[:force_remove_source_branch].present? + if params.has_key?(:force_remove_source_branch) merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) end |