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

app/services/ci/create_pipeline_service.rb

@@ -36,7 +36,7 @@ module Ci
         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 @@ module Ci
     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