Skip to content
代码片段 群组 项目
未验证 提交 be6b6565 编辑于 作者: Archish Thakkar's avatar Archish Thakkar 提交者: GitLab
浏览文件

Fix Layout/SpaceInLambdaLiteral 21 offenses

Changelog: other
上级 b2ab3eff
No related branches found
No related tags found
无相关合并请求
显示 25 个添加37 个删除
...@@ -264,18 +264,6 @@ Layout/SpaceInLambdaLiteral: ...@@ -264,18 +264,6 @@ Layout/SpaceInLambdaLiteral:
- 'lib/gitlab/ci/config/entry/rules/rule/changes.rb' - 'lib/gitlab/ci/config/entry/rules/rule/changes.rb'
- 'lib/gitlab/ci/config/entry/trigger.rb' - 'lib/gitlab/ci/config/entry/trigger.rb'
- 'lib/gitlab/ci/config/entry/variable.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/analytics/date_filler_spec.rb'
- 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb' - 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb'
- 'spec/lib/gitlab/batch_worker_context_spec.rb' - 'spec/lib/gitlab/batch_worker_context_spec.rb'
......
...@@ -8,8 +8,8 @@ class BackgroundMigrationJob < SharedModel ...@@ -8,8 +8,8 @@ class BackgroundMigrationJob < SharedModel
self.table_name = :background_migration_jobs self.table_name = :background_migration_jobs
scope :for_migration_class, -> (class_name) { where(class_name: normalize_class_name(class_name)) } 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_execution, ->(class_name, arguments) do
for_migration_class(class_name).where('arguments = ?', arguments.to_json) # rubocop:disable Rails/WhereEquals for_migration_class(class_name).where('arguments = ?', arguments.to_json) # rubocop:disable Rails/WhereEquals
end end
......
...@@ -11,7 +11,7 @@ module Handler ...@@ -11,7 +11,7 @@ module Handler
class UnsubscribeHandler < BaseHandler class UnsubscribeHandler < BaseHandler
delegate :project, to: :sent_notification, allow_nil: true 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 = HANDLER_REGEX_FOR.call(Gitlab::Email::Common::UNSUBSCRIBE_SUFFIX).freeze
HANDLER_REGEX_LEGACY = HANDLER_REGEX_FOR.call(Gitlab::Email::Common::UNSUBSCRIBE_SUFFIX_LEGACY).freeze HANDLER_REGEX_LEGACY = HANDLER_REGEX_FOR.call(Gitlab::Email::Common::UNSUBSCRIBE_SUFFIX_LEGACY).freeze
......
...@@ -46,7 +46,7 @@ def self.configure!(store) ...@@ -46,7 +46,7 @@ def self.configure!(store)
store.subscribe ::MergeRequests::ExecuteApprovalHooksWorker, to: ::MergeRequests::ApprovedEvent store.subscribe ::MergeRequests::ExecuteApprovalHooksWorker, to: ::MergeRequests::ApprovedEvent
store.subscribe ::Ml::ExperimentTracking::AssociateMlCandidateToPackageWorker, store.subscribe ::Ml::ExperimentTracking::AssociateMlCandidateToPackageWorker,
to: ::Packages::PackageCreatedEvent, 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 store.subscribe ::Ci::InitializePipelinesIidSequenceWorker, to: ::Projects::ProjectCreatedEvent
end end
private_class_method :configure! private_class_method :configure!
......
...@@ -9,33 +9,33 @@ class GlRepository ...@@ -9,33 +9,33 @@ class GlRepository
PROJECT = RepoType.new( PROJECT = RepoType.new(
name: :project, name: :project,
access_checker_class: Gitlab::GitAccessProject, 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 ).freeze
WIKI = RepoType.new( WIKI = RepoType.new(
name: :wiki, name: :wiki,
access_checker_class: Gitlab::GitAccessWiki, 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 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) ::Repository.new(wiki.full_path, wiki, shard: wiki.repository_storage, disk_path: wiki.disk_path, repo_type: WIKI)
end, end,
container_class: ProjectWiki, container_class: ProjectWiki,
project_resolver: -> (wiki) { wiki.try(:project) }, project_resolver: ->(wiki) { wiki.try(:project) },
guest_read_ability: :download_wiki_code, guest_read_ability: :download_wiki_code,
suffix: :wiki suffix: :wiki
).freeze ).freeze
SNIPPET = RepoType.new( SNIPPET = RepoType.new(
name: :snippet, name: :snippet,
access_checker_class: Gitlab::GitAccessSnippet, 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, container_class: Snippet,
project_resolver: -> (snippet) { snippet&.project }, project_resolver: ->(snippet) { snippet&.project },
guest_read_ability: :read_snippet guest_read_ability: :read_snippet
).freeze ).freeze
DESIGN = ::Gitlab::GlRepository::RepoType.new( DESIGN = ::Gitlab::GlRepository::RepoType.new(
name: :design, name: :design,
access_checker_class: ::Gitlab::GitAccessDesign, access_checker_class: ::Gitlab::GitAccessDesign,
repository_resolver: -> (design_management_repository) { design_management_repository.repository }, repository_resolver: ->(design_management_repository) { design_management_repository.repository },
project_resolver: -> (design_management_repository) { design_management_repository&.project }, project_resolver: ->(design_management_repository) { design_management_repository&.project },
suffix: :design, suffix: :design,
container_class: DesignManagement::Repository container_class: DesignManagement::Repository
).freeze ).freeze
......
...@@ -50,7 +50,7 @@ def rack_app ...@@ -50,7 +50,7 @@ def rack_app
Rack::Builder.app do Rack::Builder.app do
use Rack::Deflater use Rack::Deflater
use HealthChecks::Middleware, readiness, liveness use HealthChecks::Middleware, readiness, liveness
run -> (env) { [404, {}, ['']] } run ->(env) { [404, {}, ['']] }
end end
end end
......
...@@ -53,12 +53,12 @@ def new_mr_description ...@@ -53,12 +53,12 @@ def new_mr_description
'reference' => ->(merge_request, _, _) { merge_request.to_reference(full: true) }, 'reference' => ->(merge_request, _, _) { merge_request.to_reference(full: true) },
'local_reference' => ->(merge_request, _, _) { merge_request.to_reference(full: false) }, 'local_reference' => ->(merge_request, _, _) { merge_request.to_reference(full: false) },
'source_project_id' => ->(merge_request, _, _) { merge_request.source_project.id.to_s }, '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? return unless merge_request.persisted? || merge_request.compare_commits.present?
merge_request.first_commit&.safe_message&.strip 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 merge_request.first_multiline_commit&.safe_message&.strip.presence || merge_request.title
}, },
'url' => ->(merge_request, _, _) { Gitlab::UrlBuilder.build(merge_request) }, 'url' => ->(merge_request, _, _) { Gitlab::UrlBuilder.build(merge_request) },
...@@ -81,7 +81,7 @@ def new_mr_description ...@@ -81,7 +81,7 @@ def new_mr_description
.map { |author_email, author_name| "Co-authored-by: #{author_name} <#{author_email}>" } .map { |author_email, author_name| "Co-authored-by: #{author_name} <#{author_email}>" }
.join("\n") .join("\n")
end, end,
'all_commits' => -> (merge_request, _, _) do 'all_commits' => ->(merge_request, _, _) do
merge_request merge_request
.recent_commits .recent_commits
.without_merge_commits .without_merge_commits
......
...@@ -87,7 +87,7 @@ def rack_app ...@@ -87,7 +87,7 @@ def rack_app
use Gitlab::Metrics::Exporter::MetricsMiddleware, pid use Gitlab::Metrics::Exporter::MetricsMiddleware, pid
use Gitlab::Metrics::Exporter::GcRequestMiddleware if gc_requests use Gitlab::Metrics::Exporter::GcRequestMiddleware if gc_requests
use ::Prometheus::Client::Rack::Exporter if ::Gitlab::Metrics.metrics_folder_present? use ::Prometheus::Client::Rack::Exporter if ::Gitlab::Metrics.metrics_folder_present?
run -> (env) { [404, {}, ['']] } run ->(env) { [404, {}, ['']] }
end end
end end
......
...@@ -15,7 +15,7 @@ module VisibilityLevel ...@@ -15,7 +15,7 @@ module VisibilityLevel
scope :private_only, -> { where(visibility_level: PRIVATE) } scope :private_only, -> { where(visibility_level: PRIVATE) }
scope :non_public_only, -> { where.not(visibility_level: PUBLIC) } 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)) where(visibility_level: VisibilityLevel.levels_for_user(user))
end end
......
...@@ -69,7 +69,7 @@ def self.configure! ...@@ -69,7 +69,7 @@ def self.configure!
DeprecationToolkit::Configuration.deprecation_path = 'deprecations' DeprecationToolkit::Configuration.deprecation_path = 'deprecations'
DeprecationToolkit::Configuration.warnings_treated_as_deprecation = [kwargs_warning] DeprecationToolkit::Configuration.warnings_treated_as_deprecation = [kwargs_warning]
disallowed_deprecations = -> (deprecations) do disallowed_deprecations = ->(deprecations) do
deprecations.any? do |deprecation| deprecations.any? do |deprecation|
kwargs_warning.match?(deprecation) && kwargs_warning.match?(deprecation) &&
allowed_kwarg_warning_paths.none? { |path| deprecation.include?(path) } allowed_kwarg_warning_paths.none? { |path| deprecation.include?(path) }
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
where(:path_helper) do where(:path_helper) do
[ [
[-> (user) { admin_user_path(user) }], [->(user) { admin_user_path(user) }],
[-> (user) { projects_admin_user_path(user) }], [->(user) { projects_admin_user_path(user) }],
[-> (user) { keys_admin_user_path(user) }], [->(user) { keys_admin_user_path(user) }],
[-> (user) { admin_user_identities_path(user) }], [->(user) { admin_user_identities_path(user) }],
[-> (user) { admin_user_impersonation_tokens_path(user) }] [->(user) { admin_user_impersonation_tokens_path(user) }]
] ]
end end
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
helper.cascading_namespace_settings_popover_data( helper.cascading_namespace_settings_popover_data(
attribute, attribute,
subgroup1, subgroup1,
-> (locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') } ->(locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') }
) )
end end
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
it 'handles network timeouts' do it 'handles network timeouts' do
actual_retries = 0 actual_retries = 0
retry_options_with_block = retry_options.merge( 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) stub_const('ContainerRegistry::BaseClient::RETRY_OPTIONS', retry_options_with_block)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册