Merge branch 'ck3g-fix-kwargs-warnings-batch-2' into 'master'

Fix kwargs deprecation warnings for Ruby 2.7

See merge request gitlab-org/gitlab!49469

app/graphql/resolvers/ci/runner_setup_resolver.rb

@@ -23,7 +23,10 @@ module Resolvers
 
       def resolve(platform:, architecture:, **args)
         instructions = Gitlab::Ci::RunnerInstructions.new(
-          { current_user: current_user, os: platform, arch: architecture }.merge(target_param(args))
+          current_user: current_user,
+          os: platform,
+          arch: architecture,
+          **target_param(args)
         )
 
         {

app/models/concerns/issuable.rb

@@ -304,14 +304,12 @@ module Issuable
     end
 
     def order_labels_priority(direction = 'ASC', excluded_labels: [], extra_select_columns: [], with_cte: false)
-      params = {
+      highest_priority = highest_label_priority(
         target_type: name,
         target_column: "#{table_name}.id",
         project_column: "#{table_name}.#{project_foreign_key}",
         excluded_labels: excluded_labels
-      }
-
-      highest_priority = highest_label_priority(params).to_sql
+      ).to_sql
 
       # When using CTE make sure to select the same columns that are on the group_by clause.
       # This prevents errors when ignored columns are present in the database.

app/models/label.rb

@@ -257,7 +257,7 @@ class Label < ApplicationRecord
   end
 
   def present(attributes)
-    super(attributes.merge(presenter_class: ::LabelPresenter))
+    super(**attributes.merge(presenter_class: ::LabelPresenter))
   end
 
   private

app/models/todo.rb

@@ -139,13 +139,11 @@ class Todo < ApplicationRecord
     # Todos with highest priority first then oldest todos
     # Need to order by created_at last because of differences on Mysql and Postgres when joining by type "Merge_request/Issue"
     def order_by_labels_priority
-      params = {
+      highest_priority = highest_label_priority(
         target_type_column: "todos.target_type",
         target_column: "todos.target_id",
         project_column: "todos.project_id"
-      }
-
-      highest_priority = highest_label_priority(params).to_sql
+      ).to_sql
 
       select("#{table_name}.*, (#{highest_priority}) AS highest_priority")
         .order(Gitlab::Database.nulls_last_order('highest_priority', 'ASC'))

app/services/ci/create_pipeline_service.rb

@@ -91,7 +91,9 @@ module Ci
     # rubocop: enable Metrics/ParameterLists
 
     def execute!(*args, &block)
-      execute(*args, &block).tap do |pipeline|
+      source, params = args[0], Hash(args[1])
+
+      execute(source, **params, &block).tap do |pipeline|
         unless pipeline.persisted?
           raise CreateError, pipeline.full_error_messages
         end

app/services/git/base_hooks_service.rb

@@ -135,11 +135,12 @@ module Git
       # We only need the last commit for the event push, and we don't
       # need the full deltas either.
       @event_push_data ||= Gitlab::DataBuilder::Push.build(
-        push_data_params(commits: commits.last, with_changed_files: false))
+        **push_data_params(commits: commits.last, with_changed_files: false)
+      )
     end
 
     def push_data
-      @push_data ||= Gitlab::DataBuilder::Push.build(push_data_params(commits: limited_commits))
+      @push_data ||= Gitlab::DataBuilder::Push.build(**push_data_params(commits: limited_commits))
 
       # Dependent code may modify the push data, so return a duplicate each time
       @push_data.dup

ee/app/graphql/resolvers/epics_resolver.rb

@@ -52,7 +52,7 @@ module Resolvers
       validate_timeframe_params!(args)
       validate_starts_with_iid!(args)
 
-      super(args)
+      super(**args)
     end
 
     def resolve_with_lookahead(**args)