Commit ff1b2e87 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'pb-refresh-service-kwargs' into 'master'

Fix Ruby 2.7 deprecation warnings for RefreshService

See merge request gitlab-org/gitlab!43675
parents 1532ed04 9630c51a
......@@ -184,7 +184,7 @@ module MergeRequests
def abort_auto_merge_with_todo(merge_request, reason)
response = abort_auto_merge(merge_request, reason)
response = ServiceResponse.new(response)
response = ServiceResponse.new(**response)
return unless response.success?
todo_service.merge_request_became_unmergeable(merge_request)
......
......@@ -190,7 +190,7 @@ RSpec.describe MergeRequests::RefreshService do
end
before do
project.repository.create_file(owner, 'CODEOWNERS', file, { branch_name: 'test', message: 'codeowners' })
project.repository.create_file(owner, 'CODEOWNERS', file, branch_name: 'test', message: 'codeowners')
subject
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment