Commit d663c926 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Merge branch...

Merge branch '57426-review-apps-some-merge-related-tests-fail-in-review-qa-jobs-but-not-in-package-and-qa' into 'master'

Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineService

Closes #57426

See merge request gitlab-org/gitlab-ce!25168
parents 7a8f8714 55e488d6
......@@ -36,7 +36,7 @@ def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request
project: project,
current_user: current_user,
push_options: params[:push_options],
**extra_options(**options))
**extra_options(options))
sequence = Gitlab::Ci::Pipeline::Chain::Sequence
.new(pipeline, command, SEQUENCE)
......@@ -108,7 +108,12 @@ def related_merge_requests
end
# rubocop: enable CodeReuse/ActiveRecord
def extra_options
def extra_options(options = {})
# In Ruby 2.4, even when options is empty, f(**options) doesn't work when f
# doesn't have any parameters. We reproduce the Ruby 2.5 behavior by
# checking explicitely that no arguments are given.
raise ArgumentError if options.any?
{} # overriden in EE
end
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