Add latest changes from gitlab-org/gitlab@master

26 files changed, 109 insertions, 109 deletions

diff --git a/app/presenters/analytics/cycle_analytics/stage_presenter.rb b/app/presenters/analytics/cycle_analytics/stage_presenter.rb
index 7b295b814bc..d023b0c5d55 100644
--- a/app/presenters/analytics/cycle_analytics/stage_presenter.rb
+++ b/app/presenters/analytics/cycle_analytics/stage_presenter.rb
@@ -28,7 +28,7 @@ module Analytics
             description: _('Time before an issue gets scheduled')
           },
           plan: {
-            title:  s_('CycleAnalyticsStage|Plan'),
+            title: s_('CycleAnalyticsStage|Plan'),
             description: _('Time before an issue starts implementation')
           },
           code: {
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 84aec19cba0..209f016dc6b 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -437,9 +437,9 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
     project_new_blob_path(
       project,
       default_branch_or_main,
-      file_name:      file_name,
+      file_name: file_name,
       commit_message: commit_message,
-      branch_name:    branch_name,
+      branch_name: branch_name,
       **additional_params
     )
   end
diff --git a/app/serializers/rollout_status_entity.rb b/app/serializers/rollout_status_entity.rb
index 9f4c844859b..f432fe98289 100644
--- a/app/serializers/rollout_status_entity.rb
+++ b/app/serializers/rollout_status_entity.rb
@@ -14,5 +14,5 @@ class RolloutStatusEntity < Grape::Entity
   expose :completion, if: -> (rollout_status, _) { rollout_status.found? }
   expose :complete?, as: :is_completed, if: -> (rollout_status, _) { rollout_status.found? }
   expose :canary_ingress, using: RolloutStatuses::IngressEntity, expose_nil: false,
-         if: -> (rollout_status, _) { rollout_status.found? && rollout_status.canary_ingress_exists? }
+                          if: -> (rollout_status, _) { rollout_status.found? && rollout_status.canary_ingress_exists? }
 end
diff --git a/app/services/chat_names/authorize_user_service.rb b/app/services/chat_names/authorize_user_service.rb
index f7780488923..8da76c809ac 100644
--- a/app/services/chat_names/authorize_user_service.rb
+++ b/app/services/chat_names/authorize_user_service.rb
@@ -29,11 +29,11 @@ module ChatNames
 
     def chat_name_params
       {
-        service_id:  @service.id,
-        team_id:     @params[:team_id],
+        service_id: @service.id,
+        team_id: @params[:team_id],
         team_domain: @params[:team_domain],
-        chat_id:     @params[:user_id],
-        chat_name:   @params[:user_name]
+        chat_id: @params[:user_id],
+        chat_name: @params[:user_name]
       }
     end
   end
diff --git a/app/services/ci/archive_trace_service.rb b/app/services/ci/archive_trace_service.rb
index 7b1d2207460..9705a236d98 100644
--- a/app/services/ci/archive_trace_service.rb
+++ b/app/services/ci/archive_trace_service.rb
@@ -62,8 +62,8 @@ module Ci
       failed_archive_counter.increment
 
       Sidekiq.logger.warn(class: worker_name,
-        message: "Failed to archive trace. message: #{error.message}.",
-        job_id: job.id)
+                          message: "Failed to archive trace. message: #{error.message}.",
+                          job_id: job.id)
 
       Gitlab::ErrorTracking
         .track_and_raise_for_dev_exception(error,
diff --git a/app/services/ci/job_artifacts/destroy_batch_service.rb b/app/services/ci/job_artifacts/destroy_batch_service.rb
index 9d6b413ce59..c85082174cc 100644
--- a/app/services/ci/job_artifacts/destroy_batch_service.rb
+++ b/app/services/ci/job_artifacts/destroy_batch_service.rb
@@ -54,7 +54,7 @@ module Ci
         increment_monitoring_statistics(artifacts_count, artifacts_bytes)
 
         success(destroyed_artifacts_count: artifacts_count,
-          statistics_updates: affected_project_statistics)
+                statistics_updates: affected_project_statistics)
       end
       # rubocop: enable CodeReuse/ActiveRecord
 
diff --git a/app/services/ci/list_config_variables_service.rb b/app/services/ci/list_config_variables_service.rb
index 88dac514bb9..c791a89b804 100644
--- a/app/services/ci/list_config_variables_service.rb
+++ b/app/services/ci/list_config_variables_service.rb
@@ -26,8 +26,8 @@ module Ci
       return {} unless config
 
       result = Gitlab::Ci::YamlProcessor.new(config, project: project,
-                                                     user:    current_user,
-                                                     sha:     sha).execute
+                                                     user: current_user,
+                                                     sha: sha).execute
 
       result.valid? ? result.variables_with_data : {}
     end
diff --git a/app/services/ci/parse_dotenv_artifact_service.rb b/app/services/ci/parse_dotenv_artifact_service.rb
index 40e2cd82b4f..fd13ed245cf 100644
--- a/app/services/ci/parse_dotenv_artifact_service.rb
+++ b/app/services/ci/parse_dotenv_artifact_service.rb
@@ -40,7 +40,7 @@ module Ci
           key, value = scan_line!(line)
 
           variables[key] = Ci::JobVariable.new(job_id: artifact.job_id,
-            source: :dotenv, key: key, value: value)
+                                               source: :dotenv, key: key, value: value)
         end
       end
 
diff --git a/app/services/ci/stuck_builds/drop_helpers.rb b/app/services/ci/stuck_builds/drop_helpers.rb
index 048b52c6e13..dca50963883 100644
--- a/app/services/ci/stuck_builds/drop_helpers.rb
+++ b/app/services/ci/stuck_builds/drop_helpers.rb
@@ -56,12 +56,12 @@ module Ci
 
       def log_dropping_message(type, build, reason)
         Gitlab::AppLogger.info(class: self.class.name,
-          message: "Dropping #{type} build",
-          build_stuck_type: type,
-          build_id: build.id,
-          runner_id: build.runner_id,
-          build_status: build.status,
-          build_failure_reason: reason)
+                               message: "Dropping #{type} build",
+                               build_stuck_type: type,
+                               build_id: build.id,
+                               runner_id: build.runner_id,
+                               build_status: build.status,
+                               build_failure_reason: reason)
       end
     end
   end
diff --git a/app/services/groups/import_export/import_service.rb b/app/services/groups/import_export/import_service.rb
index f026f1698a9..db52a272bf2 100644
--- a/app/services/groups/import_export/import_service.rb
+++ b/app/services/groups/import_export/import_service.rb
@@ -97,17 +97,17 @@ module Groups
 
       def notify_success
         @logger.info(
-          group_id:   group.id,
+          group_id: group.id,
           group_name: group.name,
-          message:    'Group Import/Export: Import succeeded'
+          message: 'Group Import/Export: Import succeeded'
         )
       end
 
       def notify_error
         @logger.error(
-          group_id:   group.id,
+          group_id: group.id,
           group_name: group.name,
-          message:    "Group Import/Export: Errors occurred, see '#{Gitlab::ErrorTracking::Logger.file_name}' for details"
+          message: "Group Import/Export: Errors occurred, see '#{Gitlab::ErrorTracking::Logger.file_name}' for details"
         )
       end
 
diff --git a/app/services/issuable/import_csv/base_service.rb b/app/services/issuable/import_csv/base_service.rb
index 9b41c88159f..6ab8ec79f41 100644
--- a/app/services/issuable/import_csv/base_service.rb
+++ b/app/services/issuable/import_csv/base_service.rb
@@ -22,9 +22,9 @@ module Issuable
       def process_csv
         with_csv_lines.each do |row, line_no|
           issuable_attributes = {
-            title:       row[:title],
+            title: row[:title],
             description: row[:description],
-            due_date:    row[:due_date]
+            due_date: row[:due_date]
           }
 
           if create_issuable(issuable_attributes).persisted?
diff --git a/app/services/issues/export_csv_service.rb b/app/services/issues/export_csv_service.rb
index 7076e858155..6209127bd86 100644
--- a/app/services/issues/export_csv_service.rb
+++ b/app/services/issues/export_csv_service.rb
@@ -25,24 +25,24 @@ module Issues
       {
         'Title' => 'title',
         'Description' => 'description',
-       'Issue ID' => 'iid',
-       'URL' => -> (issue) { issue_url(issue) },
-       'State' => -> (issue) { issue.closed? ? 'Closed' : 'Open' },
-       'Author' => 'author_name',
-       'Author Username' => -> (issue) { issue.author&.username },
-       'Assignee' => -> (issue) { issue.assignees.map(&:name).join(', ') },
-       'Assignee Username' => -> (issue) { issue.assignees.map(&:username).join(', ') },
-       'Confidential' => -> (issue) { issue.confidential? ? 'Yes' : 'No' },
-       'Locked' => -> (issue) { issue.discussion_locked? ? 'Yes' : 'No' },
-       'Due Date' => -> (issue) { issue.due_date&.to_s(:csv) },
-       'Created At (UTC)' => -> (issue) { issue.created_at&.to_s(:csv) },
-       'Updated At (UTC)' => -> (issue) { issue.updated_at&.to_s(:csv) },
-       'Closed At (UTC)' => -> (issue) { issue.closed_at&.to_s(:csv) },
-       'Milestone' => -> (issue) { issue.milestone&.title },
-       'Weight' => -> (issue) { issue.weight },
-       'Labels' => -> (issue) { issue_labels(issue) },
-       'Time Estimate' => ->(issue) { issue.time_estimate.to_s(:csv) },
-       'Time Spent' => -> (issue) { issue_time_spent(issue) }
+        'Issue ID' => 'iid',
+        'URL' => -> (issue) { issue_url(issue) },
+        'State' => -> (issue) { issue.closed? ? 'Closed' : 'Open' },
+        'Author' => 'author_name',
+        'Author Username' => -> (issue) { issue.author&.username },
+        'Assignee' => -> (issue) { issue.assignees.map(&:name).join(', ') },
+        'Assignee Username' => -> (issue) { issue.assignees.map(&:username).join(', ') },
+        'Confidential' => -> (issue) { issue.confidential? ? 'Yes' : 'No' },
+        'Locked' => -> (issue) { issue.discussion_locked? ? 'Yes' : 'No' },
+        'Due Date' => -> (issue) { issue.due_date&.to_s(:csv) },
+        'Created At (UTC)' => -> (issue) { issue.created_at&.to_s(:csv) },
+        'Updated At (UTC)' => -> (issue) { issue.updated_at&.to_s(:csv) },
+        'Closed At (UTC)' => -> (issue) { issue.closed_at&.to_s(:csv) },
+        'Milestone' => -> (issue) { issue.milestone&.title },
+        'Weight' => -> (issue) { issue.weight },
+        'Labels' => -> (issue) { issue_labels(issue) },
+        'Time Estimate' => ->(issue) { issue.time_estimate.to_s(:csv) },
+        'Time Spent' => -> (issue) { issue_time_spent(issue) }
       }
     end
 
diff --git a/app/services/jira/requests/base.rb b/app/services/jira/requests/base.rb
index 8e8511e5180..d0ca8863c29 100644
--- a/app/services/jira/requests/base.rb
+++ b/app/services/jira/requests/base.rb
@@ -9,10 +9,10 @@ module Jira
 
       ERRORS = {
         connection: [Errno::ECONNRESET, Errno::ECONNREFUSED],
-        jira_ruby:  JIRA::HTTPError,
-        ssl:        OpenSSL::SSL::SSLError,
-        timeout:    [Timeout::Error, Errno::ETIMEDOUT],
-        uri:        [URI::InvalidURIError, SocketError]
+        jira_ruby: JIRA::HTTPError,
+        ssl: OpenSSL::SSL::SSLError,
+        timeout: [Timeout::Error, Errno::ETIMEDOUT],
+        uri: [URI::InvalidURIError, SocketError]
       }.freeze
       ALL_ERRORS = ERRORS.values.flatten.freeze
 
diff --git a/app/services/merge_requests/mergeability_check_service.rb b/app/services/merge_requests/mergeability_check_service.rb
index 30531fcc17b..1ce44f465cd 100644
--- a/app/services/merge_requests/mergeability_check_service.rb
+++ b/app/services/merge_requests/mergeability_check_service.rb
@@ -78,8 +78,8 @@ module MergeRequests
       lease_key = "mergeability_check:#{merge_request.id}"
 
       lease_opts = {
-        ttl:       1.minute,
-        retries:   retry_lease ? 10 : 0,
+        ttl: 1.minute,
+        retries: retry_lease ? 10 : 0,
         sleep_sec: retry_lease ? 1.second : 0
       }
 
diff --git a/app/services/merge_requests/push_options_handler_service.rb b/app/services/merge_requests/push_options_handler_service.rb
index 076fe8c3b21..ef251f121ae 100644
--- a/app/services/merge_requests/push_options_handler_service.rb
+++ b/app/services/merge_requests/push_options_handler_service.rb
@@ -105,7 +105,7 @@ module MergeRequests
           project: project,
           current_user: current_user,
           params: merge_request.attributes.merge(assignees: merge_request.assignees,
-                                         label_ids: merge_request.label_ids)
+                                                 label_ids: merge_request.label_ids)
         ).execute
       end
 
diff --git a/app/services/merge_requests/toggle_attention_requested_service.rb b/app/services/merge_requests/toggle_attention_requested_service.rb
index 64cdcd725a2..4776d73cd9f 100644
--- a/app/services/merge_requests/toggle_attention_requested_service.rb
+++ b/app/services/merge_requests/toggle_attention_requested_service.rb
@@ -62,7 +62,7 @@ module MergeRequests
 
     def update_state(reviewer_or_assignee)
       reviewer_or_assignee&.update(state: reviewer_or_assignee&.attention_requested? ? :reviewed : :attention_requested,
-        updated_state_by: current_user)
+                                   updated_state_by: current_user)
     end
   end
 end
diff --git a/app/services/packages/conan/create_package_file_service.rb b/app/services/packages/conan/create_package_file_service.rb
index 1bde9606492..904a1d10bcb 100644
--- a/app/services/packages/conan/create_package_file_service.rb
+++ b/app/services/packages/conan/create_package_file_service.rb
@@ -13,11 +13,11 @@ module Packages
 
       def execute
         package_file = package.package_files.build(
-          file:      file,
-          size:      params['file.size'],
+          file: file,
+          size: params['file.size'],
           file_name: params[:file_name],
           file_sha1: params['file.sha1'],
-          file_md5:  params['file.md5'],
+          file_md5: params['file.md5'],
           conan_file_metadatum_attributes: {
             recipe_revision: params[:recipe_revision],
             package_revision: params[:package_revision],
diff --git a/app/services/packages/create_package_file_service.rb b/app/services/packages/create_package_file_service.rb
index 5723b0b4717..6e1a5672a52 100644
--- a/app/services/packages/create_package_file_service.rb
+++ b/app/services/packages/create_package_file_service.rb
@@ -10,12 +10,12 @@ module Packages
 
     def execute
       package_file = package.package_files.build(
-        file:        params[:file],
-        size:        params[:size],
-        file_name:   params[:file_name],
-        file_sha1:   params[:file_sha1],
+        file: params[:file],
+        size: params[:size],
+        file_name: params[:file_name],
+        file_sha1: params[:file_sha1],
         file_sha256: params[:file_sha256],
-        file_md5:    params[:file_md5]
+        file_md5: params[:file_md5]
       )
 
       if params[:build].present?
diff --git a/app/services/packages/debian/create_package_file_service.rb b/app/services/packages/debian/create_package_file_service.rb
index fbbc8159ca0..53275fdc9bb 100644
--- a/app/services/packages/debian/create_package_file_service.rb
+++ b/app/services/packages/debian/create_package_file_service.rb
@@ -17,12 +17,12 @@ module Packages
         # Debian package file are first uploaded to incoming with empty metadata,
         # and are moved later by Packages::Debian::ProcessChangesService
         package.package_files.create!(
-          file:        params[:file],
-          size:        params[:file]&.size,
-          file_name:   params[:file_name],
-          file_sha1:   params[:file_sha1],
+          file: params[:file],
+          size: params[:file]&.size,
+          file_name: params[:file_name],
+          file_sha1: params[:file_sha1],
           file_sha256: params[:file]&.sha256,
-          file_md5:    params[:file_md5],
+          file_md5: params[:file_md5],
           debian_file_metadatum_attributes: {
             file_type: 'unknown',
             architecture: nil,
diff --git a/app/services/packages/npm/create_package_service.rb b/app/services/packages/npm/create_package_service.rb
index b0a5f37cfa3..a3596314199 100644
--- a/app/services/packages/npm/create_package_service.rb
+++ b/app/services/packages/npm/create_package_service.rb
@@ -87,11 +87,11 @@ module Packages
 
       def file_params
         {
-          file:      CarrierWaveStringFile.new(Base64.decode64(attachment['data'])),
-          size:      calculated_package_file_size,
+          file: CarrierWaveStringFile.new(Base64.decode64(attachment['data'])),
+          size: calculated_package_file_size,
           file_sha1: version_data[:dist][:shasum],
           file_name: package_file_name,
-          build:     params[:build]
+          build: params[:build]
         }
       end
 
diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb
index 70a04cd556a..5fce816064b 100644
--- a/app/services/projects/fork_service.rb
+++ b/app/services/projects/fork_service.rb
@@ -46,15 +46,15 @@ module Projects
 
     def new_fork_params
       new_params = {
-        forked_from_project:       @project,
-        visibility_level:          target_visibility_level,
-        description:               target_description,
-        name:                      target_name,
-        path:                      target_path,
-        shared_runners_enabled:    @project.shared_runners_enabled,
-        namespace_id:              target_namespace.id,
-        fork_network:              fork_network,
-        ci_config_path:            @project.ci_config_path,
+        forked_from_project: @project,
+        visibility_level: target_visibility_level,
+        description: target_description,
+        name: target_name,
+        path: target_path,
+        shared_runners_enabled: @project.shared_runners_enabled,
+        namespace_id: target_namespace.id,
+        fork_network: fork_network,
+        ci_config_path: @project.ci_config_path,
         # We need to set ci_default_git_depth to 0 for the forked project when
         # @project.ci_default_git_depth is nil in order to keep the same behaviour
         # and not get ProjectCiCdSetting::DEFAULT_GIT_DEPTH set on create
@@ -63,8 +63,8 @@ module Projects
         # been instantiated to avoid ActiveRecord trying to create it when
         # initializing the project, as that would cause a foreign key constraint
         # exception.
-        relations_block:           -> (project) { build_fork_network_member(project) },
-        skip_disk_validation:      skip_disk_validation,
+        relations_block: -> (project) { build_fork_network_member(project) },
+        skip_disk_validation: skip_disk_validation,
         external_authorization_classification_label: @project.external_authorization_classification_label,
         suggestion_commit_message: @project.suggestion_commit_message,
         merge_commit_template: @project.merge_commit_template,
diff --git a/app/services/projects/lfs_pointers/lfs_download_service.rb b/app/services/projects/lfs_pointers/lfs_download_service.rb
index c032fbf1508..eaf73b78c1c 100644
--- a/app/services/projects/lfs_pointers/lfs_download_service.rb
+++ b/app/services/projects/lfs_pointers/lfs_download_service.rb
@@ -50,7 +50,7 @@ module Projects
 
       def find_or_create_lfs_object(tmp_file)
         lfs_obj = LfsObject.safe_find_or_create_by!(
-          oid:  lfs_oid,
+          oid: lfs_oid,
           size: lfs_size
         )
 
diff --git a/app/services/projects/update_remote_mirror_service.rb b/app/services/projects/update_remote_mirror_service.rb
index 705d23ec704..f686f14b5b3 100644
--- a/app/services/projects/update_remote_mirror_service.rb
+++ b/app/services/projects/update_remote_mirror_service.rb
@@ -76,11 +76,11 @@ module Projects
 
       if message.present?
         Gitlab::AppJsonLogger.info(message: "Error synching remote mirror",
-          project_id: project.id,
-          project_path: project.full_path,
-          remote_mirror_id: remote_mirror.id,
-          lfs_sync_failed: lfs_sync_failed,
-          divergent_ref_list: response.divergent_refs)
+                                   project_id: project.id,
+                                   project_path: project.full_path,
+                                   remote_mirror_id: remote_mirror.id,
+                                   lfs_sync_failed: lfs_sync_failed,
+                                   divergent_ref_list: response.divergent_refs)
       end
 
       [failed, message]
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index bd959b14648..bf5be708060 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -142,8 +142,8 @@ class FileUploader < GitlabUploader
 
   def to_h
     {
-      alt:      markdown_name,
-      url:      secure_url,
+      alt: markdown_name,
+      url: secure_url,
       markdown: markdown_link
     }
   end
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index d7bd8207f06..5cc9bb6954e 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -17,8 +17,8 @@ class EmailsOnPushWorker # rubocop:disable Scalability/IdempotentWorker
   def perform(project_id, recipients, push_data, options = {})
     options.symbolize_keys!
     options.reverse_merge!(
-      send_from_committer_email:  false,
-      disable_diffs:              false
+      send_from_committer_email: false,
+      disable_diffs: false
     )
     send_from_committer_email = options[:send_from_committer_email]
     disable_diffs = options[:disable_diffs]
@@ -64,14 +64,14 @@ class EmailsOnPushWorker # rubocop:disable Scalability/IdempotentWorker
       send_email(
         recipient,
         project_id,
-        author_id:                 author_id,
-        ref:                       ref,
-        action:                    action,
-        compare:                   compare,
-        reverse_compare:           reverse_compare,
-        diff_refs:                 diff_refs,
+        author_id: author_id,
+        ref: ref,
+        action: action,
+        compare: compare,
+        reverse_compare: reverse_compare,
+        diff_refs: diff_refs,
         send_from_committer_email: send_from_committer_email,
-        disable_diffs:             disable_diffs
+        disable_diffs: disable_diffs
       )
 
     # These are input errors and won't be corrected even if Sidekiq retries
diff --git a/app/workers/x509_issuer_crl_check_worker.rb b/app/workers/x509_issuer_crl_check_worker.rb
index 39440504927..cb5bae7ca4e 100644
--- a/app/workers/x509_issuer_crl_check_worker.rb
+++ b/app/workers/x509_issuer_crl_check_worker.rb
@@ -41,13 +41,13 @@ class X509IssuerCrlCheckWorker
 
       certs.find_each do |cert|
         logger.info(message: "Certificate revoked",
-          id: cert.id,
-          email: cert.email,
-          subject: cert.subject,
-          serial_number: cert.serial_number,
-          issuer: cert.x509_issuer.id,
-          issuer_subject: cert.x509_issuer.subject,
-          issuer_crl_url: cert.x509_issuer.crl_url)
+                    id: cert.id,
+                    email: cert.email,
+                    subject: cert.subject,
+                    serial_number: cert.serial_number,
+                    issuer: cert.x509_issuer.id,
+                    issuer_subject: cert.x509_issuer.subject,
+                    issuer_crl_url: cert.x509_issuer.crl_url)
       end
 
       certs.update_all(certificate_status: :revoked)
@@ -61,18 +61,18 @@ class X509IssuerCrlCheckWorker
       OpenSSL::X509::CRL.new(response.body)
     else
       logger.warn(message: "Failed to download certificate revocation list",
-        issuer: issuer.id,
-        issuer_subject: issuer.subject,
-        issuer_crl_url: issuer.crl_url)
+                  issuer: issuer.id,
+                  issuer_subject: issuer.subject,
+                  issuer_crl_url: issuer.crl_url)
 
       nil
     end
 
   rescue OpenSSL::X509::CRLError
     logger.warn(message: "Failed to parse certificate revocation list",
-      issuer: issuer.id,
-      issuer_subject: issuer.subject,
-      issuer_crl_url: issuer.crl_url)
+                issuer: issuer.id,
+                issuer_subject: issuer.subject,
+                issuer_crl_url: issuer.crl_url)
 
     nil
   end