diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/api/merge_requests.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r-- | lib/api/merge_requests.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 931d2322c98..a9617482557 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -436,14 +436,11 @@ module API mr_params = declared_params(include_missing: false) mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch) if mr_params.has_key?(:remove_source_branch) mr_params = convert_parameters_from_legacy_format(mr_params) + mr_params[:use_specialized_service] = true - service = if mr_params.one? && (mr_params.keys & %i[assignee_id assignee_ids]).one? - ::MergeRequests::UpdateAssigneesService - else - ::MergeRequests::UpdateService - end - - merge_request = service.new(project: user_project, current_user: current_user, params: mr_params).execute(merge_request) + merge_request = ::MergeRequests::UpdateService + .new(project: user_project, current_user: current_user, params: mr_params) + .execute(merge_request) handle_merge_request_errors!(merge_request) |