summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/update_service.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-14 16:58:57 -0600
committerRobert Speicher <rspeicher@gmail.com>2018-12-16 20:40:35 -0500
commit7a07be5693f6dad1b27e568fc3961f5307f7012f (patch)
treee8b4869d0b813d2fd8a62891b5409da6ca9d61e7 /app/services/merge_requests/update_service.rb
parent8b4602041cf2c4a8738a4796d78720017249249f (diff)
downloadgitlab-ce-7a07be5693f6dad1b27e568fc3961f5307f7012f.tar.gz
Change deprecated `except!` usages
These can just be `delete` calls, with the caveat that it only takes one argument.
Diffstat (limited to 'app/services/merge_requests/update_service.rb')
-rw-r--r--app/services/merge_requests/update_service.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index aacaf10d09c..33d8299c8b6 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -5,14 +5,15 @@ module MergeRequests
def execute(merge_request)
# We don't allow change of source/target projects and source branch
# after merge request was created
- params.except!(:source_project_id)
- params.except!(:target_project_id)
- params.except!(:source_branch)
+ params.delete(:source_project_id)
+ params.delete(:target_project_id)
+ params.delete(:source_branch)
merge_from_quick_action(merge_request) if params[:merge]
if merge_request.closed_without_fork?
- params.except!(:target_branch, :force_remove_source_branch)
+ params.delete(:target_branch)
+ params.delete(:force_remove_source_branch)
end
if params[:force_remove_source_branch].present?