summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_when_build_succeeds_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/merge_requests/merge_when_build_succeeds_service.rb')
-rw-r--r--app/services/merge_requests/merge_when_build_succeeds_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_when_build_succeeds_service.rb b/app/services/merge_requests/merge_when_build_succeeds_service.rb
index a4418360b8c..d5cae2f98f7 100644
--- a/app/services/merge_requests/merge_when_build_succeeds_service.rb
+++ b/app/services/merge_requests/merge_when_build_succeeds_service.rb
@@ -1,7 +1,7 @@
module MergeRequests
class MergeWhenBuildSucceedsService < MergeRequests::BaseService
def execute(merge_request)
- merge_request.merge_params.merge!(params[:merge_params])
+ merge_request.merge_params.merge!(params)
# The service is also called when the merge params are updated.
already_approved = merge_request.merge_when_build_succeeds?