diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml index a3c3f5daf96d160507812926c22690f017981436..f6d5f67867d0f80a39ae4888ce01035d8da0e7c1 100644 --- a/.rubocop_todo/layout/space_in_lambda_literal.yml +++ b/.rubocop_todo/layout/space_in_lambda_literal.yml @@ -264,18 +264,6 @@ Layout/SpaceInLambdaLiteral: - 'lib/gitlab/ci/config/entry/rules/rule/changes.rb' - 'lib/gitlab/ci/config/entry/trigger.rb' - 'lib/gitlab/ci/config/entry/variable.rb' - - 'lib/gitlab/database/background_migration_job.rb' - - 'lib/gitlab/email/handler/unsubscribe_handler.rb' - - 'lib/gitlab/event_store.rb' - - 'lib/gitlab/gl_repository.rb' - - 'lib/gitlab/health_checks/server.rb' - - 'lib/gitlab/merge_requests/message_generator.rb' - - 'lib/gitlab/metrics/exporter/base_exporter.rb' - - 'lib/gitlab/visibility_level.rb' - - 'spec/deprecation_toolkit_env.rb' - - 'spec/features/admin/users/admin_sees_unconfirmed_user_spec.rb' - - 'spec/helpers/namespaces_helper_spec.rb' - - 'spec/lib/container_registry/client_spec.rb' - 'spec/lib/gitlab/analytics/date_filler_spec.rb' - 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb' - 'spec/lib/gitlab/batch_worker_context_spec.rb' diff --git a/lib/gitlab/database/background_migration_job.rb b/lib/gitlab/database/background_migration_job.rb index 5141dd05e4e461c9fd3334874fd33766e71bb262..dbe2d28a9c1b2f0078ec87e30c23a37d6c644b11 100644 --- a/lib/gitlab/database/background_migration_job.rb +++ b/lib/gitlab/database/background_migration_job.rb @@ -8,8 +8,8 @@ class BackgroundMigrationJob < SharedModel self.table_name = :background_migration_jobs - scope :for_migration_class, -> (class_name) { where(class_name: normalize_class_name(class_name)) } - scope :for_migration_execution, -> (class_name, arguments) do + scope :for_migration_class, ->(class_name) { where(class_name: normalize_class_name(class_name)) } + scope :for_migration_execution, ->(class_name, arguments) do for_migration_class(class_name).where('arguments = ?', arguments.to_json) # rubocop:disable Rails/WhereEquals end diff --git a/lib/gitlab/email/handler/unsubscribe_handler.rb b/lib/gitlab/email/handler/unsubscribe_handler.rb index a4e526d9a243fcf8befc06598962c060a25f7b9b..bd3ef71e07b41d71cdfcbbbc5ca259b17a064d28 100644 --- a/lib/gitlab/email/handler/unsubscribe_handler.rb +++ b/lib/gitlab/email/handler/unsubscribe_handler.rb @@ -11,7 +11,7 @@ module Handler class UnsubscribeHandler < BaseHandler delegate :project, to: :sent_notification, allow_nil: true - HANDLER_REGEX_FOR = -> (suffix) { /\A(?<reply_token>\w+)#{Regexp.escape(suffix)}\z/ }.freeze + HANDLER_REGEX_FOR = ->(suffix) { /\A(?<reply_token>\w+)#{Regexp.escape(suffix)}\z/ }.freeze HANDLER_REGEX = HANDLER_REGEX_FOR.call(Gitlab::Email::Common::UNSUBSCRIBE_SUFFIX).freeze HANDLER_REGEX_LEGACY = HANDLER_REGEX_FOR.call(Gitlab::Email::Common::UNSUBSCRIBE_SUFFIX_LEGACY).freeze diff --git a/lib/gitlab/event_store.rb b/lib/gitlab/event_store.rb index 638c94473b4473ba525737757989db476570a808..4e782973192b24278f5a1acf933044788f04c778 100644 --- a/lib/gitlab/event_store.rb +++ b/lib/gitlab/event_store.rb @@ -46,7 +46,7 @@ def self.configure!(store) store.subscribe ::MergeRequests::ExecuteApprovalHooksWorker, to: ::MergeRequests::ApprovedEvent store.subscribe ::Ml::ExperimentTracking::AssociateMlCandidateToPackageWorker, to: ::Packages::PackageCreatedEvent, - if: -> (event) { ::Ml::ExperimentTracking::AssociateMlCandidateToPackageWorker.handles_event?(event) } + if: ->(event) { ::Ml::ExperimentTracking::AssociateMlCandidateToPackageWorker.handles_event?(event) } store.subscribe ::Ci::InitializePipelinesIidSequenceWorker, to: ::Projects::ProjectCreatedEvent end private_class_method :configure! diff --git a/lib/gitlab/gl_repository.rb b/lib/gitlab/gl_repository.rb index 5745b65b6fc9e888a0f830348405d53b64e5ae8e..f1991e783c6c3cdc5a92d3ec0026d442886d89e8 100644 --- a/lib/gitlab/gl_repository.rb +++ b/lib/gitlab/gl_repository.rb @@ -9,33 +9,33 @@ class GlRepository PROJECT = RepoType.new( name: :project, access_checker_class: Gitlab::GitAccessProject, - repository_resolver: -> (project) { ::Repository.new(project.full_path, project, shard: project.repository_storage, disk_path: project.disk_path) } + repository_resolver: ->(project) { ::Repository.new(project.full_path, project, shard: project.repository_storage, disk_path: project.disk_path) } ).freeze WIKI = RepoType.new( name: :wiki, access_checker_class: Gitlab::GitAccessWiki, - repository_resolver: -> (container) do + repository_resolver: ->(container) do wiki = container.is_a?(Wiki) ? container : container.wiki # Also allow passing a Project, Group, or Geo::DeletedProject ::Repository.new(wiki.full_path, wiki, shard: wiki.repository_storage, disk_path: wiki.disk_path, repo_type: WIKI) end, container_class: ProjectWiki, - project_resolver: -> (wiki) { wiki.try(:project) }, + project_resolver: ->(wiki) { wiki.try(:project) }, guest_read_ability: :download_wiki_code, suffix: :wiki ).freeze SNIPPET = RepoType.new( name: :snippet, access_checker_class: Gitlab::GitAccessSnippet, - repository_resolver: -> (snippet) { ::Repository.new(snippet.full_path, snippet, shard: snippet.repository_storage, disk_path: snippet.disk_path, repo_type: SNIPPET) }, + repository_resolver: ->(snippet) { ::Repository.new(snippet.full_path, snippet, shard: snippet.repository_storage, disk_path: snippet.disk_path, repo_type: SNIPPET) }, container_class: Snippet, - project_resolver: -> (snippet) { snippet&.project }, + project_resolver: ->(snippet) { snippet&.project }, guest_read_ability: :read_snippet ).freeze DESIGN = ::Gitlab::GlRepository::RepoType.new( name: :design, access_checker_class: ::Gitlab::GitAccessDesign, - repository_resolver: -> (design_management_repository) { design_management_repository.repository }, - project_resolver: -> (design_management_repository) { design_management_repository&.project }, + repository_resolver: ->(design_management_repository) { design_management_repository.repository }, + project_resolver: ->(design_management_repository) { design_management_repository&.project }, suffix: :design, container_class: DesignManagement::Repository ).freeze diff --git a/lib/gitlab/health_checks/server.rb b/lib/gitlab/health_checks/server.rb index d747b64a2215db697900a5e1530f718f38231666..a01039bab033487c94a7844dd85d0b4d4b5a101f 100644 --- a/lib/gitlab/health_checks/server.rb +++ b/lib/gitlab/health_checks/server.rb @@ -50,7 +50,7 @@ def rack_app Rack::Builder.app do use Rack::Deflater use HealthChecks::Middleware, readiness, liveness - run -> (env) { [404, {}, ['']] } + run ->(env) { [404, {}, ['']] } end end diff --git a/lib/gitlab/merge_requests/message_generator.rb b/lib/gitlab/merge_requests/message_generator.rb index 2307d4fc64e090a3d98f92bcd362f9109ce6007a..72d60bc37765e156aea394a70e441302bc462aff 100644 --- a/lib/gitlab/merge_requests/message_generator.rb +++ b/lib/gitlab/merge_requests/message_generator.rb @@ -53,12 +53,12 @@ def new_mr_description 'reference' => ->(merge_request, _, _) { merge_request.to_reference(full: true) }, 'local_reference' => ->(merge_request, _, _) { merge_request.to_reference(full: false) }, 'source_project_id' => ->(merge_request, _, _) { merge_request.source_project.id.to_s }, - 'first_commit' => -> (merge_request, _, _) { + 'first_commit' => ->(merge_request, _, _) { return unless merge_request.persisted? || merge_request.compare_commits.present? merge_request.first_commit&.safe_message&.strip }, - 'first_multiline_commit' => -> (merge_request, _, _) { + 'first_multiline_commit' => ->(merge_request, _, _) { merge_request.first_multiline_commit&.safe_message&.strip.presence || merge_request.title }, 'url' => ->(merge_request, _, _) { Gitlab::UrlBuilder.build(merge_request) }, @@ -81,7 +81,7 @@ def new_mr_description .map { |author_email, author_name| "Co-authored-by: #{author_name} <#{author_email}>" } .join("\n") end, - 'all_commits' => -> (merge_request, _, _) do + 'all_commits' => ->(merge_request, _, _) do merge_request .recent_commits .without_merge_commits diff --git a/lib/gitlab/metrics/exporter/base_exporter.rb b/lib/gitlab/metrics/exporter/base_exporter.rb index e22b9c2a761e5d55d6aa407e8a5040d749a6fbfe..59d0ee0c412d5a4b2848c04a95030897010982b4 100644 --- a/lib/gitlab/metrics/exporter/base_exporter.rb +++ b/lib/gitlab/metrics/exporter/base_exporter.rb @@ -87,7 +87,7 @@ def rack_app use Gitlab::Metrics::Exporter::MetricsMiddleware, pid use Gitlab::Metrics::Exporter::GcRequestMiddleware if gc_requests use ::Prometheus::Client::Rack::Exporter if ::Gitlab::Metrics.metrics_folder_present? - run -> (env) { [404, {}, ['']] } + run ->(env) { [404, {}, ['']] } end end diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb index 8b016a098895941abb4fc5e3b3af723a66dbc926..7041d10ef885e2c59d27cc2e65e216f81ba507e9 100644 --- a/lib/gitlab/visibility_level.rb +++ b/lib/gitlab/visibility_level.rb @@ -15,7 +15,7 @@ module VisibilityLevel scope :private_only, -> { where(visibility_level: PRIVATE) } scope :non_public_only, -> { where.not(visibility_level: PUBLIC) } - scope :public_to_user, -> (user = nil) do + scope :public_to_user, ->(user = nil) do where(visibility_level: VisibilityLevel.levels_for_user(user)) end diff --git a/spec/deprecation_toolkit_env.rb b/spec/deprecation_toolkit_env.rb index 94bd88fbc75e31f8352bf8cc2ebcc7eaa3d0640e..60901ab5afdb84c994850127519f8bbd666f0871 100644 --- a/spec/deprecation_toolkit_env.rb +++ b/spec/deprecation_toolkit_env.rb @@ -69,7 +69,7 @@ def self.configure! DeprecationToolkit::Configuration.deprecation_path = 'deprecations' DeprecationToolkit::Configuration.warnings_treated_as_deprecation = [kwargs_warning] - disallowed_deprecations = -> (deprecations) do + disallowed_deprecations = ->(deprecations) do deprecations.any? do |deprecation| kwargs_warning.match?(deprecation) && allowed_kwarg_warning_paths.none? { |path| deprecation.include?(path) } diff --git a/spec/features/admin/users/admin_sees_unconfirmed_user_spec.rb b/spec/features/admin/users/admin_sees_unconfirmed_user_spec.rb index 3554b3d40d2cc3c1af5a721b5c684200a298e93e..beb0e8ec4fedf46d79af175be8e5b9c3416dd081 100644 --- a/spec/features/admin/users/admin_sees_unconfirmed_user_spec.rb +++ b/spec/features/admin/users/admin_sees_unconfirmed_user_spec.rb @@ -19,11 +19,11 @@ where(:path_helper) do [ - [-> (user) { admin_user_path(user) }], - [-> (user) { projects_admin_user_path(user) }], - [-> (user) { keys_admin_user_path(user) }], - [-> (user) { admin_user_identities_path(user) }], - [-> (user) { admin_user_impersonation_tokens_path(user) }] + [->(user) { admin_user_path(user) }], + [->(user) { projects_admin_user_path(user) }], + [->(user) { keys_admin_user_path(user) }], + [->(user) { admin_user_identities_path(user) }], + [->(user) { admin_user_impersonation_tokens_path(user) }] ] end diff --git a/spec/helpers/namespaces_helper_spec.rb b/spec/helpers/namespaces_helper_spec.rb index 7de89e7ee3c1e8d7ce9efa606a7ef78354499397..b5eb8d8682be4286c79d1f7afff92a0654b4fb3a 100644 --- a/spec/helpers/namespaces_helper_spec.rb +++ b/spec/helpers/namespaces_helper_spec.rb @@ -49,7 +49,7 @@ helper.cascading_namespace_settings_popover_data( attribute, subgroup1, - -> (locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') } + ->(locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') } ) end diff --git a/spec/lib/container_registry/client_spec.rb b/spec/lib/container_registry/client_spec.rb index c8f835b970496d7bceed6d48e2b9f333b4e0f05d..72a7e0eb6e86a133ff53a3205bfaa5b7c202052e 100644 --- a/spec/lib/container_registry/client_spec.rb +++ b/spec/lib/container_registry/client_spec.rb @@ -23,7 +23,7 @@ it 'handles network timeouts' do actual_retries = 0 retry_options_with_block = retry_options.merge( - retry_block: -> (_, _, _, _) { actual_retries += 1 } + retry_block: ->(_, _, _, _) { actual_retries += 1 } ) stub_const('ContainerRegistry::BaseClient::RETRY_OPTIONS', retry_options_with_block)