From 2c82ac4d15a924f3ce2cba7418865a7601f333a6 Mon Sep 17 00:00:00 2001 From: Jonathan Schafer <jschafer@gitlab.com> Date: Wed, 17 Aug 2022 07:08:20 +0000 Subject: [PATCH] Fix Layout/SpaceInsideBlockBraces offenses in app This fixes all non-test file offenses --- .../layout/space_inside_block_braces.yml | 92 ------------------- app/controllers/groups/boards_controller.rb | 4 +- .../profiles/two_factor_auths_controller.rb | 2 +- app/controllers/projects/boards_controller.rb | 4 +- ...ity_reports_mr_widget_prompt_experiment.rb | 4 +- ...orials_continuous_onboarding_experiment.rb | 4 +- app/helpers/favicon_helper.rb | 2 +- app/helpers/time_zone_helper.rb | 2 +- app/helpers/todos_helper.rb | 2 +- app/models/authentication_event.rb | 2 +- app/models/bulk_imports/entity.rb | 2 +- app/models/concerns/featurable.rb | 2 +- app/models/integrations/bamboo.rb | 4 +- app/models/integrations/buildkite.rb | 2 +- app/models/integrations/teamcity.rb | 4 +- app/models/network/graph.rb | 2 +- app/models/operations/feature_flag.rb | 2 +- app/models/packages/package.rb | 2 +- app/models/preloaders/labels_preloader.rb | 4 +- app/models/project.rb | 2 +- app/models/release.rb | 2 +- app/models/release_highlight.rb | 2 +- .../project_recalculate_service.rb | 2 +- app/services/notification_service.rb | 2 +- config/initializers/wikicloth_redos_patch.rb | 2 +- ...16_finalize_ci_stages_bigint_conversion.rb | 2 +- ...push_event_payloads_bigint_conversion_3.rb | 4 +- .../training_providers/base_url_finder.rb | 2 +- .../oncall_rotation/base.rb | 2 +- ee/app/helpers/ee/dashboard_helper.rb | 2 +- .../scan_finding_wrapped_rule_set.rb | 2 +- .../models/compliance_management/framework.rb | 2 +- ee/app/models/dora/daily_metrics.rb | 4 +- ee/app/models/ee/application_setting.rb | 2 +- ee/app/models/ee/deployment.rb | 2 +- ee/app/models/ee/member.rb | 4 +- ee/app/models/vulnerabilities/feedback.rb | 2 +- ee/app/models/vulnerabilities/identifier.rb | 2 +- .../vulnerabilities/finding_entity.rb | 2 +- .../elastic/cluster_reindexing_service.rb | 2 +- .../references/iteration_reference_filter.rb | 4 +- ee/lib/ee/gitlab/auth/ldap/group.rb | 2 +- .../drop_invalid_remediations.rb | 2 +- ee/lib/elastic/latest/git_class_proxy.rb | 2 +- ee/lib/gitlab/auth/smartcard/san_extension.rb | 2 +- ee/lib/world.rb | 2 +- lib/api/commits.rb | 4 +- lib/api/helpers/merge_requests_helpers.rb | 2 +- lib/backup/manager.rb | 2 +- .../references/label_reference_filter.rb | 4 +- .../references/milestone_reference_filter.rb | 4 +- lib/bitbucket/representation/base.rb | 2 +- lib/bitbucket_server/representation/base.rb | 2 +- ...fix_projects_without_prometheus_service.rb | 2 +- lib/gitlab/contributions_calendar.rb | 2 +- .../migrations/base_background_runner.rb | 2 +- lib/gitlab/database/postgres_hll/buckets.rb | 4 +- .../diff/rendered/notebook/diff_file.rb | 2 +- .../rendered/notebook/diff_file_helper.rb | 4 +- .../message/in_product_marketing/helper.rb | 2 +- lib/gitlab/issues/rebalancing/state.rb | 8 +- lib/gitlab/profiler.rb | 2 +- lib/kramdown/converter/commonmark.rb | 6 +- lib/release_highlights/validator/entry.rb | 2 +- .../ci_configuration/sast_build_action.rb | 10 +- lib/tasks/gitlab/db.rake | 2 +- lib/tasks/gitlab/info.rake | 2 +- lib/tasks/gitlab/praefect.rake | 2 +- lib/tasks/gitlab/shell.rake | 2 +- lib/tasks/gitlab/tw/codeowners.rake | 2 +- .../migration/add_limit_to_text_columns.rb | 2 +- scripts/qa/testcases-check | 4 +- spec/channels/awareness_channel_spec.rb | 2 +- .../pajamas/banner_component_spec.rb | 2 +- spec/frontend/fixtures/integrations.rb | 2 +- .../fixtures/prometheus_integration.rb | 2 +- .../validators/schema_validator_spec.rb | 2 +- .../memory/reports/jemalloc_stats_spec.rb | 6 +- ...lerts_to_exclude_null_fingerprints_spec.rb | 2 +- .../approval_removal_settings_spec.rb | 4 +- spec/policies/timelog_policy_spec.rb | 2 +- .../simple_package_versions_presenter_spec.rb | 2 +- spec/scripts/changed-feature-flags_spec.rb | 4 +- .../basic_deploy_key_entity_spec.rb | 4 +- .../deploy_keys/deploy_key_entity_spec.rb | 4 +- .../bulk_delete_runners_service_spec.rb | 2 +- .../assignees_service/update_service_spec.rb | 2 +- .../update_service_spec.rb | 2 +- spec/support/helpers/graphql_helpers.rb | 4 +- .../helpers/wiki_helpers_shared_examples.rb | 2 +- .../devise/sessions/new.html.haml_spec.rb | 2 +- .../cleanup/execute_policy_worker_spec.rb | 2 +- 92 files changed, 124 insertions(+), 216 deletions(-) diff --git a/.rubocop_todo/layout/space_inside_block_braces.yml b/.rubocop_todo/layout/space_inside_block_braces.yml index d8454708d821a..4fdc308eaa589 100644 --- a/.rubocop_todo/layout/space_inside_block_braces.yml +++ b/.rubocop_todo/layout/space_inside_block_braces.yml @@ -2,80 +2,6 @@ # Cop supports --auto-correct. Layout/SpaceInsideBlockBraces: Exclude: - - 'app/controllers/groups/boards_controller.rb' - - 'app/controllers/profiles/two_factor_auths_controller.rb' - - 'app/controllers/projects/boards_controller.rb' - - 'app/experiments/security_reports_mr_widget_prompt_experiment.rb' - - 'app/experiments/video_tutorials_continuous_onboarding_experiment.rb' - - 'app/helpers/favicon_helper.rb' - - 'app/helpers/time_zone_helper.rb' - - 'app/helpers/todos_helper.rb' - - 'app/models/authentication_event.rb' - - 'app/models/bulk_imports/entity.rb' - - 'app/models/concerns/featurable.rb' - - 'app/models/integrations/bamboo.rb' - - 'app/models/integrations/buildkite.rb' - - 'app/models/integrations/teamcity.rb' - - 'app/models/network/graph.rb' - - 'app/models/operations/feature_flag.rb' - - 'app/models/packages/package.rb' - - 'app/models/preloaders/labels_preloader.rb' - - 'app/models/project.rb' - - 'app/models/release.rb' - - 'app/models/release_highlight.rb' - - 'app/services/authorized_project_update/project_recalculate_service.rb' - - 'app/services/notification_service.rb' - - 'config/initializers/wikicloth_redos_patch.rb' - - 'db/post_migrate/20210707210916_finalize_ci_stages_bigint_conversion.rb' - - 'db/post_migrate/20210802043253_finalize_push_event_payloads_bigint_conversion_3.rb' - - 'ee/app/finders/security/training_providers/base_url_finder.rb' - - 'ee/app/graphql/mutations/incident_management/oncall_rotation/base.rb' - - 'ee/app/helpers/ee/dashboard_helper.rb' - - 'ee/app/models/approvals/scan_finding_wrapped_rule_set.rb' - - 'ee/app/models/compliance_management/framework.rb' - - 'ee/app/models/dora/daily_metrics.rb' - - 'ee/app/models/ee/application_setting.rb' - - 'ee/app/models/ee/deployment.rb' - - 'ee/app/models/ee/member.rb' - - 'ee/app/models/vulnerabilities/feedback.rb' - - 'ee/app/models/vulnerabilities/identifier.rb' - - 'ee/app/serializers/vulnerabilities/finding_entity.rb' - - 'ee/app/services/elastic/cluster_reindexing_service.rb' - - 'ee/lib/ee/banzai/filter/references/iteration_reference_filter.rb' - - 'ee/lib/ee/gitlab/auth/ldap/group.rb' - - 'ee/lib/ee/gitlab/background_migration/drop_invalid_remediations.rb' - - 'ee/lib/elastic/latest/git_class_proxy.rb' - - 'ee/lib/gitlab/auth/smartcard/san_extension.rb' - - 'ee/lib/world.rb' - - 'ee/spec/features/admin/admin_runners_spec.rb' - - 'lib/api/commits.rb' - - 'lib/api/helpers/merge_requests_helpers.rb' - - 'lib/backup/manager.rb' - - 'lib/banzai/filter/references/label_reference_filter.rb' - - 'lib/banzai/filter/references/milestone_reference_filter.rb' - - 'lib/bitbucket/representation/base.rb' - - 'lib/bitbucket_server/representation/base.rb' - - 'lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb' - - 'lib/gitlab/contributions_calendar.rb' - - 'lib/gitlab/database/migrations/base_background_runner.rb' - - 'lib/gitlab/database/postgres_hll/buckets.rb' - - 'lib/gitlab/diff/rendered/notebook/diff_file.rb' - - 'lib/gitlab/diff/rendered/notebook/diff_file_helper.rb' - - 'lib/gitlab/email/message/in_product_marketing/helper.rb' - - 'lib/gitlab/issues/rebalancing/state.rb' - - 'lib/gitlab/profiler.rb' - - 'lib/kramdown/converter/commonmark.rb' - - 'lib/release_highlights/validator/entry.rb' - - 'lib/security/ci_configuration/sast_build_action.rb' - - 'lib/tasks/gitlab/db.rake' - - 'lib/tasks/gitlab/info.rake' - - 'lib/tasks/gitlab/praefect.rake' - - 'lib/tasks/gitlab/shell.rake' - - 'lib/tasks/gitlab/tw/codeowners.rake' - - 'rubocop/cop/migration/add_limit_to_text_columns.rb' - - 'scripts/qa/testcases-check' - - 'spec/channels/awareness_channel_spec.rb' - - 'spec/components/pajamas/banner_component_spec.rb' - 'spec/config/settings_spec.rb' - 'spec/controllers/admin/application_settings_controller_spec.rb' - 'spec/controllers/application_controller_spec.rb' @@ -123,7 +49,6 @@ Layout/SpaceInsideBlockBraces: - 'spec/frontend/fixtures/clusters.rb' - 'spec/frontend/fixtures/deploy_keys.rb' - 'spec/frontend/fixtures/groups.rb' - - 'spec/frontend/fixtures/integrations.rb' - 'spec/frontend/fixtures/issues.rb' - 'spec/frontend/fixtures/jobs.rb' - 'spec/frontend/fixtures/labels.rb' @@ -133,7 +58,6 @@ Layout/SpaceInsideBlockBraces: - 'spec/frontend/fixtures/pipeline_schedules.rb' - 'spec/frontend/fixtures/pipelines.rb' - 'spec/frontend/fixtures/projects.rb' - - 'spec/frontend/fixtures/prometheus_integration.rb' - 'spec/frontend/fixtures/raw.rb' - 'spec/frontend/fixtures/snippet.rb' - 'spec/frontend/fixtures/todos.rb' @@ -147,40 +71,27 @@ Layout/SpaceInsideBlockBraces: - 'spec/helpers/wiki_page_version_helper_spec.rb' - 'spec/initializers/carrierwave_patch_spec.rb' - 'spec/initializers/trusted_proxies_spec.rb' - - 'spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb' - - 'spec/lib/gitlab/memory/reports/jemalloc_stats_spec.rb' - 'spec/mailers/emails/service_desk_spec.rb' - 'spec/migrations/20210812013042_remove_duplicate_project_authorizations_spec.rb' - 'spec/migrations/20210910194952_update_report_type_for_existing_approval_project_rules_spec.rb' - - 'spec/migrations/20220505174658_update_index_on_alerts_to_exclude_null_fingerprints_spec.rb' - 'spec/migrations/confirm_support_bot_user_spec.rb' - 'spec/migrations/reset_job_token_scope_enabled_again_spec.rb' - 'spec/migrations/reset_job_token_scope_enabled_spec.rb' - 'spec/migrations/reset_severity_levels_to_new_default_spec.rb' - - 'spec/models/merge_request/approval_removal_settings_spec.rb' - 'spec/policies/clusters/agent_policy_spec.rb' - 'spec/policies/group_member_policy_spec.rb' - 'spec/policies/issue_policy_spec.rb' - 'spec/policies/project_policy_spec.rb' - 'spec/policies/terraform/state_policy_spec.rb' - 'spec/policies/terraform/state_version_policy_spec.rb' - - 'spec/policies/timelog_policy_spec.rb' - 'spec/presenters/packages/composer/packages_presenter_spec.rb' - 'spec/presenters/packages/conan/package_presenter_spec.rb' - 'spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb' - - 'spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb' - 'spec/presenters/project_presenter_spec.rb' - 'spec/rubocop/cop/migration/create_table_with_foreign_keys_spec.rb' - - 'spec/scripts/changed-feature-flags_spec.rb' - 'spec/serializers/cluster_entity_spec.rb' - - 'spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb' - - 'spec/serializers/deploy_keys/deploy_key_entity_spec.rb' - 'spec/serializers/import/provider_repo_serializer_spec.rb' - - 'spec/services/ci/runners/bulk_delete_runners_service_spec.rb' - - 'spec/services/work_items/widgets/assignees_service/update_service_spec.rb' - - 'spec/services/work_items/widgets/start_and_due_date_service/update_service_spec.rb' - 'spec/support/helpers/cycle_analytics_helpers.rb' - - 'spec/support/helpers/graphql_helpers.rb' - 'spec/support/redis/redis_shared_examples.rb' - 'spec/support/shared_contexts/graphql/requests/packages_shared_context.rb' - 'spec/support/shared_contexts/markdown_golden_master_shared_examples.rb' @@ -190,7 +101,6 @@ Layout/SpaceInsideBlockBraces: - 'spec/support/shared_examples/features/board_sidebar_labels_examples.rb' - 'spec/support/shared_examples/features/snippets_shared_examples.rb' - 'spec/support/shared_examples/features/wiki/user_views_asciidoc_page_with_includes_shared_examples.rb' - - 'spec/support/shared_examples/helpers/wiki_helpers_shared_examples.rb' - 'spec/support/shared_examples/lib/gitlab/ci/ci_trace_shared_examples.rb' - 'spec/support/shared_examples/lib/gitlab/sql/set_operator_shared_examples.rb' - 'spec/support/shared_examples/models/cluster_application_core_shared_examples.rb' @@ -212,14 +122,12 @@ Layout/SpaceInsideBlockBraces: - 'spec/tasks/gitlab/snippets_rake_spec.rb' - 'spec/uploaders/packages/debian/distribution_release_file_uploader_spec.rb' - 'spec/validators/addressable_url_validator_spec.rb' - - 'spec/views/devise/sessions/new.html.haml_spec.rb' - 'spec/views/help/instance_configuration.html.haml_spec.rb' - 'spec/views/layouts/_header_search.html.haml_spec.rb' - 'spec/views/layouts/_published_experiments.html.haml_spec.rb' - 'spec/views/shared/runners/_runner_details.html.haml_spec.rb' - 'spec/workers/bulk_imports/export_request_worker_spec.rb' - 'spec/workers/clusters/cleanup/project_namespace_worker_spec.rb' - - 'spec/workers/packages/cleanup/execute_policy_worker_spec.rb' - 'spec/workers/packages/helm/extraction_worker_spec.rb' - 'spec/workers/pages_worker_spec.rb' - 'spec/workers/purge_dependency_proxy_cache_worker_spec.rb' diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index 0fbceb43be1f5..e64d838b7d1e5 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -10,8 +10,8 @@ class Groups::BoardsController < Groups::ApplicationController push_frontend_feature_flag(:board_multi_select, group) push_frontend_feature_flag(:realtime_labels, group) experiment(:prominent_create_board_btn, subject: current_user) do |e| - e.control { } - e.candidate { } + e.control {} + e.candidate {} end.run end diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb index 2e71b4801ed7e..0b7d4626c6d59 100644 --- a/app/controllers/profiles/two_factor_auths_controller.rb +++ b/app/controllers/profiles/two_factor_auths_controller.rb @@ -234,7 +234,7 @@ def webauthn_options def groups_notification(groups) group_links = groups.map { |group| view_context.link_to group.full_name, group_path(group) }.to_sentence - leave_group_links = groups.map { |group| view_context.link_to (s_("leave %{group_name}") % { group_name: group.full_name }), leave_group_members_path(group), remote: false, method: :delete}.to_sentence + leave_group_links = groups.map { |group| view_context.link_to (s_("leave %{group_name}") % { group_name: group.full_name }), leave_group_members_path(group), remote: false, method: :delete }.to_sentence s_(%{The group settings for %{group_links} require you to enable Two-Factor Authentication for your account. You can %{leave_group_links}.}) .html_safe % { group_links: group_links.html_safe, leave_group_links: leave_group_links.html_safe } diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index 36986a714fbfa..82b35a226696a 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -10,8 +10,8 @@ class Projects::BoardsController < Projects::ApplicationController push_frontend_feature_flag(:board_multi_select, project) push_frontend_feature_flag(:realtime_labels, project&.group) experiment(:prominent_create_board_btn, subject: current_user) do |e| - e.control { } - e.candidate { } + e.control {} + e.candidate {} end.run end diff --git a/app/experiments/security_reports_mr_widget_prompt_experiment.rb b/app/experiments/security_reports_mr_widget_prompt_experiment.rb index 51b81be672d5f..1bf3e15ba3b7d 100644 --- a/app/experiments/security_reports_mr_widget_prompt_experiment.rb +++ b/app/experiments/security_reports_mr_widget_prompt_experiment.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true class SecurityReportsMrWidgetPromptExperiment < ApplicationExperiment - control { } - candidate { } + control {} + candidate {} def publish(_result = nil) super diff --git a/app/experiments/video_tutorials_continuous_onboarding_experiment.rb b/app/experiments/video_tutorials_continuous_onboarding_experiment.rb index 3cb676b25f201..2c5790f83d130 100644 --- a/app/experiments/video_tutorials_continuous_onboarding_experiment.rb +++ b/app/experiments/video_tutorials_continuous_onboarding_experiment.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true class VideoTutorialsContinuousOnboardingExperiment < ApplicationExperiment - control { } - candidate { } + control {} + candidate {} end diff --git a/app/helpers/favicon_helper.rb b/app/helpers/favicon_helper.rb index be73efe0aac5c..c98c7c4909a54 100644 --- a/app/helpers/favicon_helper.rb +++ b/app/helpers/favicon_helper.rb @@ -3,7 +3,7 @@ module FaviconHelper def favicon_extension_allowlist FaviconUploader::EXTENSION_ALLOWLIST - .map { |extension| "'.#{extension}'"} + .map { |extension| "'.#{extension}'" } .to_sentence end end diff --git a/app/helpers/time_zone_helper.rb b/app/helpers/time_zone_helper.rb index d16f13304e563..29bd5a846519e 100644 --- a/app/helpers/time_zone_helper.rb +++ b/app/helpers/time_zone_helper.rb @@ -18,7 +18,7 @@ module TimeZoneHelper # def timezone_data(format: :short) attrs = TIME_ZONE_FORMAT_ATTRS.fetch(format) do - valid_formats = TIME_ZONE_FORMAT_ATTRS.keys.map { |k| ":#{k}"}.join(", ") + valid_formats = TIME_ZONE_FORMAT_ATTRS.keys.map { |k| ":#{k}" }.join(", ") raise ArgumentError, "Invalid format :#{format}. Valid formats are #{valid_formats}." end diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 42f1b45c9c5f8..95294b4375b38 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -179,7 +179,7 @@ def todo_types_options end def todo_actions_dropdown_label(selected_action_id, default_action) - selected_action = todo_actions_options.find { |action| action[:id] == selected_action_id.to_i} + selected_action = todo_actions_options.find { |action| action[:id] == selected_action_id.to_i } selected_action ? selected_action[:text] : default_action end diff --git a/app/models/authentication_event.rb b/app/models/authentication_event.rb index 0ed197f32dff3..d5a5079acd681 100644 --- a/app/models/authentication_event.rb +++ b/app/models/authentication_event.rb @@ -20,7 +20,7 @@ class AuthenticationEvent < ApplicationRecord } scope :for_provider, ->(provider) { where(provider: provider) } - scope :ldap, -> { where('provider LIKE ?', 'ldap%')} + scope :ldap, -> { where('provider LIKE ?', 'ldap%') } def self.providers STATIC_PROVIDERS | Devise.omniauth_providers.map(&:to_s) diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb index 69777f3a0bfaa..e0a616b5fb41f 100644 --- a/app/models/bulk_imports/entity.rb +++ b/app/models/bulk_imports/entity.rb @@ -52,7 +52,7 @@ class BulkImports::Entity < ApplicationRecord scope :by_user_id, ->(user_id) { joins(:bulk_import).where(bulk_imports: { user_id: user_id }) } scope :stale, -> { where('created_at < ?', 8.hours.ago).where(status: [0, 1]) } - scope :by_bulk_import_id, ->(bulk_import_id) { where(bulk_import_id: bulk_import_id)} + scope :by_bulk_import_id, ->(bulk_import_id) { where(bulk_import_id: bulk_import_id) } scope :order_by_created_at, -> (direction) { order(created_at: direction) } alias_attribute :destination_slug, :destination_name diff --git a/app/models/concerns/featurable.rb b/app/models/concerns/featurable.rb index 0028404e3b616..3b74120822106 100644 --- a/app/models/concerns/featurable.rb +++ b/app/models/concerns/featurable.rb @@ -114,7 +114,7 @@ def allowed_access_levels self.errors.add(field, "cannot have public visibility level") if not_allowed end - (self.class.available_features - feature_validation_exclusion).each {|f| validator.call("#{f}_access_level")} + (self.class.available_features - feature_validation_exclusion).each { |f| validator.call("#{f}_access_level") } end # Features that we should exclude from the validation diff --git a/app/models/integrations/bamboo.rb b/app/models/integrations/bamboo.rb index 230dc6bb33630..c3a4b84bb2d1a 100644 --- a/app/models/integrations/bamboo.rb +++ b/app/models/integrations/bamboo.rb @@ -63,11 +63,11 @@ def self.to_param end def build_page(sha, ref) - with_reactive_cache(sha, ref) {|cached| cached[:build_page] } + with_reactive_cache(sha, ref) { |cached| cached[:build_page] } end def commit_status(sha, ref) - with_reactive_cache(sha, ref) {|cached| cached[:commit_status] } + with_reactive_cache(sha, ref) { |cached| cached[:commit_status] } end def execute(data) diff --git a/app/models/integrations/buildkite.rb b/app/models/integrations/buildkite.rb index def646c6d49a8..7a48e71b93466 100644 --- a/app/models/integrations/buildkite.rb +++ b/app/models/integrations/buildkite.rb @@ -60,7 +60,7 @@ def execute(data) end def commit_status(sha, ref) - with_reactive_cache(sha, ref) {|cached| cached[:commit_status] } + with_reactive_cache(sha, ref) { |cached| cached[:commit_status] } end def commit_status_path(sha) diff --git a/app/models/integrations/teamcity.rb b/app/models/integrations/teamcity.rb index e0299c9ac5fc6..ca7a715f4b34a 100644 --- a/app/models/integrations/teamcity.rb +++ b/app/models/integrations/teamcity.rb @@ -67,11 +67,11 @@ def help end def build_page(sha, ref) - with_reactive_cache(sha, ref) {|cached| cached[:build_page] } + with_reactive_cache(sha, ref) { |cached| cached[:build_page] } end def commit_status(sha, ref) - with_reactive_cache(sha, ref) {|cached| cached[:commit_status] } + with_reactive_cache(sha, ref) { |cached| cached[:commit_status] } end def calculate_reactive_cache(sha, ref) diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index 560ff86110524..a034d97a6bbd8 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -211,7 +211,7 @@ def place_chain(commit, parent_time = nil) # Visit branching chains leaves.each do |l| - parents = l.parents(@map).select {|p| p.space == 0} + parents = l.parents(@map).select { |p| p.space == 0 } parents.each do |p| place_chain(p, l.time) end diff --git a/app/models/operations/feature_flag.rb b/app/models/operations/feature_flag.rb index 7db396bcad5be..e36c59366fe4a 100644 --- a/app/models/operations/feature_flag.rb +++ b/app/models/operations/feature_flag.rb @@ -42,7 +42,7 @@ class FeatureFlag < ApplicationRecord scope :enabled, -> { where(active: true) } scope :disabled, -> { where(active: false) } - scope :new_version_only, -> { where(version: :new_version_flag)} + scope :new_version_only, -> { where(version: :new_version_flag) } enum version: { new_version_flag: 2 diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb index 7d2d34170faa1..afd55b4f14361 100644 --- a/app/models/packages/package.rb +++ b/app/models/packages/package.rb @@ -65,7 +65,7 @@ class Packages::Package < ApplicationRecord validates :name, uniqueness: { scope: %i[project_id version package_type], - conditions: -> { not_pending_destruction} + conditions: -> { not_pending_destruction } }, unless: -> { pending_destruction? || conan? || debian_package? } diff --git a/app/models/preloaders/labels_preloader.rb b/app/models/preloaders/labels_preloader.rb index bb3206f53990c..722d588d8bcff 100644 --- a/app/models/preloaders/labels_preloader.rb +++ b/app/models/preloaders/labels_preloader.rb @@ -21,8 +21,8 @@ def initialize(labels, user, project = nil) def preload_all preloader = ActiveRecord::Associations::Preloader.new - preloader.preload(labels.select {|l| l.is_a? ProjectLabel }, { project: [:project_feature, namespace: :route] }) - preloader.preload(labels.select {|l| l.is_a? GroupLabel }, { group: :route }) + preloader.preload(labels.select { |l| l.is_a? ProjectLabel }, { project: [:project_feature, namespace: :route] }) + preloader.preload(labels.select { |l| l.is_a? GroupLabel }, { group: :route }) labels.each do |label| label.lazy_subscription(user) label.lazy_subscription(user, project) if project.present? diff --git a/app/models/project.rb b/app/models/project.rb index 0440c5a3471da..0c49cc24a8d5f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -179,7 +179,7 @@ class Project < ApplicationRecord alias_method :parent, :namespace alias_attribute :parent_id, :namespace_id - has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event' + has_one :last_event, -> { order 'events.created_at DESC' }, class_name: 'Event' has_many :boards def self.integration_association_name(name) diff --git a/app/models/release.rb b/app/models/release.rb index ee5d7bab190ef..5ef3ff1bc6c7e 100644 --- a/app/models/release.rb +++ b/app/models/release.rb @@ -94,7 +94,7 @@ def name end def milestone_titles - self.milestones.order_by_dates_and_title.map {|m| m.title }.join(', ') + self.milestones.order_by_dates_and_title.map { |m| m.title }.join(', ') end def to_hook_data(action) diff --git a/app/models/release_highlight.rb b/app/models/release_highlight.rb index ed85c4e9c7287..c2d498ecb1384 100644 --- a/app/models/release_highlight.rb +++ b/app/models/release_highlight.rb @@ -33,7 +33,7 @@ def self.load_items(page:) next unless include_item?(item) begin - item.tap {|i| i['description'] = Banzai.render(i['description'], { project: nil }) } + item.tap { |i| i['description'] = Banzai.render(i['description'], { project: nil }) } rescue StandardError => e Gitlab::ErrorTracking.track_exception(e, file_path: file_path) diff --git a/app/services/authorized_project_update/project_recalculate_service.rb b/app/services/authorized_project_update/project_recalculate_service.rb index 17ba48cffcdc1..e0b8158417c30 100644 --- a/app/services/authorized_project_update/project_recalculate_service.rb +++ b/app/services/authorized_project_update/project_recalculate_service.rb @@ -47,7 +47,7 @@ def fresh_authorizations def user_ids_to_remove strong_memoize(:user_ids_to_remove) do (current_authorizations - fresh_authorizations) - .map {|user_id, _| user_id } + .map { |user_id, _| user_id } end end diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index 2477fcd02e59a..507787ee47ccc 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -799,7 +799,7 @@ def new_mentions_in_resource_email(target, new_mentioned_users, current_user, me end recipients = NotificationRecipients::BuildService.build_recipients(target, current_user, action: "new") - recipients = recipients.select {|r| new_mentioned_users.include?(r.user) } + recipients = recipients.select { |r| new_mentioned_users.include?(r.user) } recipients.each do |recipient| mailer.send(method, recipient.user.id, target.id, current_user.id, recipient.reason).deliver_later diff --git a/config/initializers/wikicloth_redos_patch.rb b/config/initializers/wikicloth_redos_patch.rb index a0b7c2e246634..4ff545dd6f716 100644 --- a/config/initializers/wikicloth_redos_patch.rb +++ b/config/initializers/wikicloth_redos_patch.rb @@ -120,7 +120,7 @@ def to_html key = params[0].to_s.strip key_options = params[1..].collect { |p| p.is_a?(Hash) ? { :name => p[:name].strip, :value => p[:value].strip } : p.strip } key_options ||= [] - key_digest = Digest::SHA256.hexdigest(key_options.to_a.sort {|x,y| (x.is_a?(Hash) ? x[:name] : x) <=> (y.is_a?(Hash) ? y[:name] : y) }.inspect) + key_digest = Digest::SHA256.hexdigest(key_options.to_a.sort { |x,y| (x.is_a?(Hash) ? x[:name] : x) <=> (y.is_a?(Hash) ? y[:name] : y) }.inspect) return @options[:params][key] if @options[:params].has_key?(key) # if we have a valid cache fragment use it diff --git a/db/post_migrate/20210707210916_finalize_ci_stages_bigint_conversion.rb b/db/post_migrate/20210707210916_finalize_ci_stages_bigint_conversion.rb index 33a54b298f062..f3ce32ad9c8b4 100644 --- a/db/post_migrate/20210707210916_finalize_ci_stages_bigint_conversion.rb +++ b/db/post_migrate/20210707210916_finalize_ci_stages_bigint_conversion.rb @@ -58,7 +58,7 @@ def swap # Swap defaults execute "ALTER SEQUENCE ci_stages_id_seq OWNED BY #{TABLE_NAME}.id" - change_column_default TABLE_NAME, :id, -> { "nextval('ci_stages_id_seq'::regclass)"} + change_column_default TABLE_NAME, :id, -> { "nextval('ci_stages_id_seq'::regclass)" } change_column_default TABLE_NAME, :id_convert_to_bigint, 0 # Swap pkey constraint diff --git a/db/post_migrate/20210802043253_finalize_push_event_payloads_bigint_conversion_3.rb b/db/post_migrate/20210802043253_finalize_push_event_payloads_bigint_conversion_3.rb index 2a8c63eba710d..289b77f0a5ca7 100644 --- a/db/post_migrate/20210802043253_finalize_push_event_payloads_bigint_conversion_3.rb +++ b/db/post_migrate/20210802043253_finalize_push_event_payloads_bigint_conversion_3.rb @@ -29,8 +29,8 @@ def down def already_swapped? push_event_payloads_columns = columns(TABLE_NAME) - event_id = push_event_payloads_columns.find {|c| c.name == 'event_id'} - event_id_convert_to_bigint = push_event_payloads_columns.find {|c| c.name == 'event_id_convert_to_bigint'} + event_id = push_event_payloads_columns.find { |c| c.name == 'event_id' } + event_id_convert_to_bigint = push_event_payloads_columns.find { |c| c.name == 'event_id_convert_to_bigint' } event_id.sql_type == 'bigint' && event_id_convert_to_bigint.sql_type == 'integer' end diff --git a/ee/app/finders/security/training_providers/base_url_finder.rb b/ee/app/finders/security/training_providers/base_url_finder.rb index 37ac617c3a9d0..d54ec1612f4f1 100644 --- a/ee/app/finders/security/training_providers/base_url_finder.rb +++ b/ee/app/finders/security/training_providers/base_url_finder.rb @@ -41,7 +41,7 @@ def self.from_cache(id) def response_url strong_memoize(:response_url) do - with_reactive_cache(full_url) {|data| data} + with_reactive_cache(full_url) { |data| data } end end diff --git a/ee/app/graphql/mutations/incident_management/oncall_rotation/base.rb b/ee/app/graphql/mutations/incident_management/oncall_rotation/base.rb index a6843d5c72150..473913179c7f6 100644 --- a/ee/app/graphql/mutations/incident_management/oncall_rotation/base.rb +++ b/ee/app/graphql/mutations/incident_management/oncall_rotation/base.rb @@ -72,7 +72,7 @@ def find_participants(user_array) raise_too_many_users_error if user_array.size > MAXIMUM_PARTICIPANTS - usernames = user_array.map {|h| h[:username] } + usernames = user_array.map { |h| h[:username] } raise_duplicate_users_error if usernames.size != usernames.uniq.size matched_users = UsersFinder.new(current_user, username: usernames).execute.index_by(&:username) diff --git a/ee/app/helpers/ee/dashboard_helper.rb b/ee/app/helpers/ee/dashboard_helper.rb index c8314d84aef91..1d2489d352963 100644 --- a/ee/app/helpers/ee/dashboard_helper.rb +++ b/ee/app/helpers/ee/dashboard_helper.rb @@ -24,7 +24,7 @@ def controller_action_to_child_dashboards(controller = controller_name, action = end def user_default_dashboard?(user) - controller_action_to_child_dashboards.any? {|dashboard| dashboard == user.dashboard } + controller_action_to_child_dashboards.any? { |dashboard| dashboard == user.dashboard } end def has_start_trial? diff --git a/ee/app/models/approvals/scan_finding_wrapped_rule_set.rb b/ee/app/models/approvals/scan_finding_wrapped_rule_set.rb index a7f66f8fd7011..e7ca936398d17 100644 --- a/ee/app/models/approvals/scan_finding_wrapped_rule_set.rb +++ b/ee/app/models/approvals/scan_finding_wrapped_rule_set.rb @@ -19,7 +19,7 @@ def wrapped_rules_sorted_by_approval(merge_request_rules) merge_request_rules.map! do |rule| ApprovalWrappedRule.wrap(merge_request, rule) end - merge_request_rules.sort_by {|rule| rule.approved? ? 1 : 0} + merge_request_rules.sort_by { |rule| rule.approved? ? 1 : 0 } end end end diff --git a/ee/app/models/compliance_management/framework.rb b/ee/app/models/compliance_management/framework.rb index 69d4c2f446628..bc4af1c49dde8 100644 --- a/ee/app/models/compliance_management/framework.rb +++ b/ee/app/models/compliance_management/framework.rb @@ -24,7 +24,7 @@ class Framework < ApplicationRecord validate :namespace_is_root_level_group scope :with_projects, ->(project_ids) { includes(:projects).where(projects: { id: project_ids }) } - scope :with_namespaces, ->(namespace_ids) { includes(:namespace).where(namespaces: { id: namespace_ids })} + scope :with_namespaces, ->(namespace_ids) { includes(:namespace).where(namespaces: { id: namespace_ids }) } private diff --git a/ee/app/models/dora/daily_metrics.rb b/ee/app/models/dora/daily_metrics.rb index 3eca866952e3c..72fd65fe3a32b 100644 --- a/ee/app/models/dora/daily_metrics.rb +++ b/ee/app/models/dora/daily_metrics.rb @@ -65,11 +65,11 @@ def refresh!(environment, date) VALUES ( #{environment.id}, #{connection.quote(date.to_s)}, - #{queries_to_refresh.map { |_column, query| "(#{query})"}.join(', ')} + #{queries_to_refresh.map { |_column, query| "(#{query})" }.join(', ')} ) ON CONFLICT (environment_id, date) DO UPDATE SET - #{queries_to_refresh.map { |column, query| "#{column} = (#{query})"}.join(', ')} + #{queries_to_refresh.map { |column, query| "#{column} = (#{query})" }.join(', ')} SQL end end diff --git a/ee/app/models/ee/application_setting.rb b/ee/app/models/ee/application_setting.rb index 2200994b71f11..7d803825b7bf2 100644 --- a/ee/app/models/ee/application_setting.rb +++ b/ee/app/models/ee/application_setting.rb @@ -319,7 +319,7 @@ def elasticsearch_url end def elasticsearch_url=(values) - cleaned = values.split(',').map {|url| url.strip.gsub(%r{/*\z}, '') } + cleaned = values.split(',').map { |url| url.strip.gsub(%r{/*\z}, '') } write_attribute(:elasticsearch_url, cleaned.join(',')) end diff --git a/ee/app/models/ee/deployment.rb b/ee/app/models/ee/deployment.rb index 8f0d1cf7b18f3..6a1be0bb1cbad 100644 --- a/ee/app/models/ee/deployment.rb +++ b/ee/app/models/ee/deployment.rb @@ -16,7 +16,7 @@ module Deployment has_many :approvals, class_name: 'Deployments::Approval' - scope :with_approvals, -> { preload(approvals: [:user])} + scope :with_approvals, -> { preload(approvals: [:user]) } state_machine :status do after_transition any => :success do |deployment| diff --git a/ee/app/models/ee/member.rb b/ee/app/models/ee/member.rb index 29b668d6a65b6..f3e3aae3210fc 100644 --- a/ee/app/models/ee/member.rb +++ b/ee/app/models/ee/member.rb @@ -18,8 +18,8 @@ module Member state :awaiting, value: ::Member::STATE_AWAITING state :active, value: ::Member::STATE_ACTIVE end - scope :awaiting, -> {where(state: ::Member::STATE_AWAITING)} - scope :non_awaiting, -> {where.not(state: ::Member::STATE_AWAITING)} + scope :awaiting, -> { where(state: ::Member::STATE_AWAITING) } + scope :non_awaiting, -> { where.not(state: ::Member::STATE_AWAITING) } scope :banned, -> do joins("INNER JOIN namespace_bans diff --git a/ee/app/models/vulnerabilities/feedback.rb b/ee/app/models/vulnerabilities/feedback.rb index 8333cac1b9685..a8fd19bcb24f2 100644 --- a/ee/app/models/vulnerabilities/feedback.rb +++ b/ee/app/models/vulnerabilities/feedback.rb @@ -45,7 +45,7 @@ class Feedback < ApplicationRecord scope :by_finding_uuid, -> (uuids) { where(finding_uuid: uuids) } scope :by_project, -> (project) { where(project: project) } scope :by_project_fingerprints, -> (project_fingerprints) { where(project_fingerprint: project_fingerprints) } - scope :order_by_id_asc, -> { order(id: :asc)} + scope :order_by_id_asc, -> { order(id: :asc) } scope :all_preloaded, -> do preload(:author, :comment_author, :project, :issue, :merge_request, :pipeline) diff --git a/ee/app/models/vulnerabilities/identifier.rb b/ee/app/models/vulnerabilities/identifier.rb index af9db4d5be91c..ecd135ae8aa1e 100644 --- a/ee/app/models/vulnerabilities/identifier.rb +++ b/ee/app/models/vulnerabilities/identifier.rb @@ -25,7 +25,7 @@ class Identifier < ApplicationRecord validates :name, presence: true scope :with_fingerprint, -> (fingerprints) { where(fingerprint: fingerprints) } - scope :with_external_type, -> (external_type) { where('LOWER(external_type) = LOWER(?)', external_type)} + scope :with_external_type, -> (external_type) { where('LOWER(external_type) = LOWER(?)', external_type) } def cve? external_type.casecmp?('cve') diff --git a/ee/app/serializers/vulnerabilities/finding_entity.rb b/ee/app/serializers/vulnerabilities/finding_entity.rb index 84ff28b5d22c0..f878020ed1e97 100644 --- a/ee/app/serializers/vulnerabilities/finding_entity.rb +++ b/ee/app/serializers/vulnerabilities/finding_entity.rb @@ -44,7 +44,7 @@ class Vulnerabilities::FindingEntity < Grape::Entity expose(:request, using: Vulnerabilities::RequestEntity) { |model, _| model.evidence&.dig(:request) } expose(:response, using: Vulnerabilities::ResponseEntity) { |model, _| model.evidence&.dig(:response) } expose(:evidence_source) { |model, _| model.evidence&.dig(:source) } - expose(:supporting_messages) { |model, _| model.evidence&.dig(:supporting_messages)} + expose(:supporting_messages) { |model, _| model.evidence&.dig(:supporting_messages) } expose(:assets) { |model, _| model.assets } end diff --git a/ee/app/services/elastic/cluster_reindexing_service.rb b/ee/app/services/elastic/cluster_reindexing_service.rb index e5d685f237122..487d3b3558768 100644 --- a/ee/app/services/elastic/cluster_reindexing_service.rb +++ b/ee/app/services/elastic/cluster_reindexing_service.rb @@ -60,7 +60,7 @@ def initial! return false end - expected_free_size = alias_names.sum {|name| elastic_helper.index_size_bytes(index_name: name) } * 2 + expected_free_size = alias_names.sum { |name| elastic_helper.index_size_bytes(index_name: name) } * 2 if elastic_helper.cluster_free_size_bytes < expected_free_size abort_reindexing!("You should have at least #{expected_free_size} bytes of storage available to perform reindexing. Please increase the storage in your Elasticsearch cluster before reindexing.") return false diff --git a/ee/lib/ee/banzai/filter/references/iteration_reference_filter.rb b/ee/lib/ee/banzai/filter/references/iteration_reference_filter.rb index 6b9deaf61747e..67fb0f7b1c82d 100644 --- a/ee/lib/ee/banzai/filter/references/iteration_reference_filter.rb +++ b/ee/lib/ee/banzai/filter/references/iteration_reference_filter.rb @@ -11,12 +11,12 @@ module IterationReferenceFilter def parent_records(parent, ids) return Iteration.none unless valid_context?(parent) - iteration_ids = ids.map {|y| y[:iteration_id]}.compact + iteration_ids = ids.map { |y| y[:iteration_id] }.compact unless iteration_ids.empty? id_relation = find_iterations(parent, ids: iteration_ids) end - iteration_names = ids.map {|y| y[:iteration_name]}.compact + iteration_names = ids.map { |y| y[:iteration_name] }.compact unless iteration_names.empty? iteration_relation = find_iterations(parent, names: iteration_names) end diff --git a/ee/lib/ee/gitlab/auth/ldap/group.rb b/ee/lib/ee/gitlab/auth/ldap/group.rb index be8c18c06b172..285730e3feb08 100644 --- a/ee/lib/ee/gitlab/auth/ldap/group.rb +++ b/ee/lib/ee/gitlab/auth/ldap/group.rb @@ -70,7 +70,7 @@ def has_member_range?(entry) end def member_range_attribute(entry) - entry.attribute_names.find { |a| a.to_s.start_with?("member;range=")}.to_s + entry.attribute_names.find { |a| a.to_s.start_with?("member;range=") }.to_s end def active_directory_members(entry, nested_groups_to_skip) diff --git a/ee/lib/ee/gitlab/background_migration/drop_invalid_remediations.rb b/ee/lib/ee/gitlab/background_migration/drop_invalid_remediations.rb index ce31d644c2b1a..5438c38a69fb1 100644 --- a/ee/lib/ee/gitlab/background_migration/drop_invalid_remediations.rb +++ b/ee/lib/ee/gitlab/background_migration/drop_invalid_remediations.rb @@ -22,7 +22,7 @@ def perform(start_id, end_id) findings_without_remediation_ids << finding.id if empty_remediations?(finding) end - remediations_to_destroy = finding_remediation_batch.select {|finding_remediation| findings_without_remediation_ids.include? finding_remediation.vulnerability_occurrence_id} + remediations_to_destroy = finding_remediation_batch.select { |finding_remediation| findings_without_remediation_ids.include? finding_remediation.vulnerability_occurrence_id } FindingRemediation.where(id: remediations_to_destroy).each_batch(of: 100) do |batch| batch.delete_all diff --git a/ee/lib/elastic/latest/git_class_proxy.rb b/ee/lib/elastic/latest/git_class_proxy.rb index db46c3e5df326..0516c3f8f8b5b 100644 --- a/ee/lib/elastic/latest/git_class_proxy.rb +++ b/ee/lib/elastic/latest/git_class_proxy.rb @@ -91,7 +91,7 @@ def search_commit(query, page: 1, per: 20, options: {}) options[:index_name] = Elastic::Latest::CommitConfig.index_name options[:project_id_field] = 'rid' else - fields = fields.map {|i| "commit.#{i}"} + fields = fields.map { |i| "commit.#{i}" } options[:project_id_field] = 'commit.rid' end diff --git a/ee/lib/gitlab/auth/smartcard/san_extension.rb b/ee/lib/gitlab/auth/smartcard/san_extension.rb index 95c11fb4bd801..378c3835e808d 100644 --- a/ee/lib/gitlab/auth/smartcard/san_extension.rb +++ b/ee/lib/gitlab/auth/smartcard/san_extension.rb @@ -46,7 +46,7 @@ def alternate_emails attr_reader :certificate, :gitlab_host def subject_alternate_email_identities - subject_alt_names = certificate.extensions.select {|e| e.oid == 'subjectAltName'} + subject_alt_names = certificate.extensions.select { |e| e.oid == 'subjectAltName' } subject_alt_names.each_with_object([]) do |entry, san_entries| # Parse the subject alternate name certificate extension as ASN1, first value should be the key diff --git a/ee/lib/world.rb b/ee/lib/world.rb index a2b897b42f957..2a0800931ec2f 100644 --- a/ee/lib/world.rb +++ b/ee/lib/world.rb @@ -24,7 +24,7 @@ def states_for_country(country_code) end def all_countries - strong_memoize(:all_countries) { ISO3166::Country.all.reject {|item| DENYLIST.include?(item.name) || JH_MARKET.include?(item.name) } } + strong_memoize(:all_countries) { ISO3166::Country.all.reject { |item| DENYLIST.include?(item.name) || JH_MARKET.include?(item.name) } } end def alpha3_from_alpha2(alpha2) diff --git a/lib/api/commits.rb b/lib/api/commits.rb index 221e044b24d0c..ef9d989d01358 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -304,8 +304,8 @@ def authorize_push_to_branch!(branch) not_found!('Commit') unless commit refs = [] - refs.concat(user_project.repository.branch_names_contains(commit.id).map {|name| { type: 'branch', name: name }}) unless params[:type] == 'tag' - refs.concat(user_project.repository.tag_names_contains(commit.id).map {|name| { type: 'tag', name: name }}) unless params[:type] == 'branch' + refs.concat(user_project.repository.branch_names_contains(commit.id).map { |name| { type: 'branch', name: name } }) unless params[:type] == 'tag' + refs.concat(user_project.repository.tag_names_contains(commit.id).map { |name| { type: 'tag', name: name } }) unless params[:type] == 'branch' refs = Kaminari.paginate_array(refs) present paginate(refs), with: Entities::BasicRef diff --git a/lib/api/helpers/merge_requests_helpers.rb b/lib/api/helpers/merge_requests_helpers.rb index 7c6ef1ddfe213..85648cd166dea 100644 --- a/lib/api/helpers/merge_requests_helpers.rb +++ b/lib/api/helpers/merge_requests_helpers.rb @@ -131,7 +131,7 @@ def self.sort_options end def self.sort_options_help - sort_options.map {|y| "`#{y}`" }.to_sentence(last_word_connector: ' or ') + sort_options.map { |y| "`#{y}`" }.to_sentence(last_word_connector: ' or ') end end end diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index a95311e0eccb3..902eb8f66597a 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -519,7 +519,7 @@ def backup_file_list end def available_timestamps - @backup_file_list.map {|item| item.gsub("#{FILE_NAME_SUFFIX}", "")} + @backup_file_list.map { |item| item.gsub("#{FILE_NAME_SUFFIX}", "") } end def object_storage_config diff --git a/lib/banzai/filter/references/label_reference_filter.rb b/lib/banzai/filter/references/label_reference_filter.rb index a019ae0108ede..6020c7b7f5808 100644 --- a/lib/banzai/filter/references/label_reference_filter.rb +++ b/lib/banzai/filter/references/label_reference_filter.rb @@ -12,13 +12,13 @@ def parent_records(parent, ids) return Label.none unless parent.is_a?(Project) || parent.is_a?(Group) labels = find_labels(parent) - label_ids = ids.map {|y| y[:label_id]}.compact + label_ids = ids.map { |y| y[:label_id] }.compact unless label_ids.empty? id_relation = labels.where(id: label_ids) end - label_names = ids.map {|y| y[:label_name]}.compact + label_names = ids.map { |y| y[:label_name] }.compact unless label_names.empty? label_relation = labels.where(title: label_names) end diff --git a/lib/banzai/filter/references/milestone_reference_filter.rb b/lib/banzai/filter/references/milestone_reference_filter.rb index 609aaf885ba52..77658f72d34a4 100644 --- a/lib/banzai/filter/references/milestone_reference_filter.rb +++ b/lib/banzai/filter/references/milestone_reference_filter.rb @@ -11,12 +11,12 @@ class MilestoneReferenceFilter < AbstractReferenceFilter def parent_records(parent, ids) return Milestone.none unless valid_context?(parent) - milestone_iids = ids.map {|y| y[:milestone_iid]}.compact + milestone_iids = ids.map { |y| y[:milestone_iid] }.compact unless milestone_iids.empty? iid_relation = find_milestones(parent, true).where(iid: milestone_iids) end - milestone_names = ids.map {|y| y[:milestone_name]}.compact + milestone_names = ids.map { |y| y[:milestone_name] }.compact unless milestone_names.empty? milestone_relation = find_milestones(parent, false).where(name: milestone_names) end diff --git a/lib/bitbucket/representation/base.rb b/lib/bitbucket/representation/base.rb index bb8dcd91ad56d..afd20d788c2ca 100644 --- a/lib/bitbucket/representation/base.rb +++ b/lib/bitbucket/representation/base.rb @@ -10,7 +10,7 @@ def initialize(raw) end def self.decorate(entries) - entries.map { |entry| new(entry)} + entries.map { |entry| new(entry) } end end end diff --git a/lib/bitbucket_server/representation/base.rb b/lib/bitbucket_server/representation/base.rb index a1961bae6efa5..d1a3089b7f556 100644 --- a/lib/bitbucket_server/representation/base.rb +++ b/lib/bitbucket_server/representation/base.rb @@ -10,7 +10,7 @@ def initialize(raw) end def self.decorate(entries) - entries.map { |entry| new(entry)} + entries.map { |entry| new(entry) } end def self.convert_timestamp(time_usec) diff --git a/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb b/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb index 496ec0bd0a169..97a9913fa7448 100644 --- a/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb +++ b/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb @@ -137,7 +137,7 @@ def update_inconsistent(from_id, to_id) def create_sql(from_id, to_id) <<~SQL WITH created_records AS #{Gitlab::Database::AsWithMaterialized.materialized_if_supported} ( - INSERT INTO services (project_id, #{DEFAULTS.keys.map { |key| %("#{key}")}.join(',')}, created_at, updated_at) + INSERT INTO services (project_id, #{DEFAULTS.keys.map { |key| %("#{key}") }.join(',')}, created_at, updated_at) #{select_insert_values_sql(from_id, to_id)} RETURNING * ) diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb index 4d289a59a6a09..a45380aca6cd5 100644 --- a/lib/gitlab/contributions_calendar.rb +++ b/lib/gitlab/contributions_calendar.rb @@ -43,7 +43,7 @@ def activity_dates .group(:date) .map(&:attributes) - @activity_dates = events.each_with_object(Hash.new {|h, k| h[k] = 0 }) do |event, activities| + @activity_dates = events.each_with_object(Hash.new { |h, k| h[k] = 0 }) do |event, activities| activities[event["date"]] += event["num_events"] end end diff --git a/lib/gitlab/database/migrations/base_background_runner.rb b/lib/gitlab/database/migrations/base_background_runner.rb index 2772502140e79..a9440cafd309e 100644 --- a/lib/gitlab/database/migrations/base_background_runner.rb +++ b/lib/gitlab/database/migrations/base_background_runner.rb @@ -38,7 +38,7 @@ def run_jobs_for_migration(migration_name:, jobs:, run_until:) per_background_migration_result_dir = File.join(@result_dir, migration_name) instrumentation = Instrumentation.new(result_dir: per_background_migration_result_dir) - batch_names = (1..).each.lazy.map { |i| "batch_#{i}"} + batch_names = (1..).each.lazy.map { |i| "batch_#{i}" } jobs.shuffle.each do |j| break if run_until <= Time.current diff --git a/lib/gitlab/database/postgres_hll/buckets.rb b/lib/gitlab/database/postgres_hll/buckets.rb index 76818bbf34038..cbc9544d905cb 100644 --- a/lib/gitlab/database/postgres_hll/buckets.rb +++ b/lib/gitlab/database/postgres_hll/buckets.rb @@ -38,7 +38,7 @@ def estimated_distinct_count # # @param other_buckets_hash hash with HyperLogLog structure representation def merge_hash!(other_buckets_hash) - buckets.merge!(other_buckets_hash) {|_key, old, new| new > old ? new : old } + buckets.merge!(other_buckets_hash) { |_key, old, new| new > old ? new : old } end # Serialize instance underlying HyperLogLog structure to JSON format, that can be stored in various persistence layers @@ -61,7 +61,7 @@ def estimate_cardinality num_uniques = ( ((TOTAL_BUCKETS**2) * (0.7213 / (1 + 1.079 / TOTAL_BUCKETS))) / - (num_zero_buckets + buckets.values.sum { |bucket_hash| 2**(-1 * bucket_hash)} ) + (num_zero_buckets + buckets.values.sum { |bucket_hash| 2**(-1 * bucket_hash) } ) ).to_i if num_zero_buckets > 0 && num_uniques < 2.5 * TOTAL_BUCKETS diff --git a/lib/gitlab/diff/rendered/notebook/diff_file.rb b/lib/gitlab/diff/rendered/notebook/diff_file.rb index 3e1652bd31815..31cbdc156cfac 100644 --- a/lib/gitlab/diff/rendered/notebook/diff_file.rb +++ b/lib/gitlab/diff/rendered/notebook/diff_file.rb @@ -56,7 +56,7 @@ def highlighted_diff_lines ) lines.zip(line_positions_at_source_diff(lines, transformed_blocks)) - .map { |line, positions| mutate_line(line, positions, lines_in_source)} + .map { |line, positions| mutate_line(line, positions, lines_in_source) } end end diff --git a/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb b/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb index f381792953e61..ad709a79f3069 100644 --- a/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb +++ b/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb @@ -77,8 +77,8 @@ def line_positions_at_source_diff(lines, blocks) def lines_in_source_diff(source_diff_lines, is_deleted_file, is_added_file) { - from: is_added_file ? Set[] : source_diff_lines.map {|l| l.old_pos}.to_set, - to: is_deleted_file ? Set[] : source_diff_lines.map {|l| l.new_pos}.to_set + from: is_added_file ? Set[] : source_diff_lines.map { |l| l.old_pos }.to_set, + to: is_deleted_file ? Set[] : source_diff_lines.map { |l| l.new_pos }.to_set } end diff --git a/lib/gitlab/email/message/in_product_marketing/helper.rb b/lib/gitlab/email/message/in_product_marketing/helper.rb index 0a0e55c299988..73d1e0743cce7 100644 --- a/lib/gitlab/email/message/in_product_marketing/helper.rb +++ b/lib/gitlab/email/message/in_product_marketing/helper.rb @@ -67,7 +67,7 @@ def unsubscribe_self_managed(preferences_link) def list(array) case format when :html - tag.ul { array.map { |item| tag.li item} } + tag.ul { array.map { |item| tag.li item } } else '- ' + array.join("\n- ") end diff --git a/lib/gitlab/issues/rebalancing/state.rb b/lib/gitlab/issues/rebalancing/state.rb index 3d3fd9419b2fa..abb50281f7a5e 100644 --- a/lib/gitlab/issues/rebalancing/state.rb +++ b/lib/gitlab/issues/rebalancing/state.rb @@ -38,10 +38,10 @@ def concurrent_running_rebalances_count def rebalance_in_progress? is_running = case rebalanced_container_type when NAMESPACE - namespace_ids = self.class.current_rebalancing_containers.map {|string| string.split("#{NAMESPACE}/").second.to_i }.compact + namespace_ids = self.class.current_rebalancing_containers.map { |string| string.split("#{NAMESPACE}/").second.to_i }.compact namespace_ids.include?(root_namespace.id) when PROJECT - project_ids = self.class.current_rebalancing_containers.map {|string| string.split("#{PROJECT}/").second.to_i }.compact + project_ids = self.class.current_rebalancing_containers.map { |string| string.split("#{PROJECT}/").second.to_i }.compact project_ids.include?(projects.take.id) # rubocop:disable CodeReuse/ActiveRecord else false @@ -90,11 +90,11 @@ def get_current_project_id end def issue_count - @issue_count ||= with_redis { |redis| redis.zcard(issue_ids_key)} + @issue_count ||= with_redis { |redis| redis.zcard(issue_ids_key) } end def remove_current_project_id_cache - with_redis { |redis| redis.del(current_project_key)} + with_redis { |redis| redis.del(current_project_key) } end def refresh_keys_expiration diff --git a/lib/gitlab/profiler.rb b/lib/gitlab/profiler.rb index d15b57eb8881a..fd9f73d18c1b8 100644 --- a/lib/gitlab/profiler.rb +++ b/lib/gitlab/profiler.rb @@ -146,7 +146,7 @@ def self.with_user(user) if user API::Helpers::CommonHelpers.send(:define_method, :find_current_user!) { user } # rubocop:disable GitlabSecurity/PublicSend ApplicationController.send(:define_method, :current_user) { user } # rubocop:disable GitlabSecurity/PublicSend - ApplicationController.send(:define_method, :authenticate_user!) { } # rubocop:disable GitlabSecurity/PublicSend + ApplicationController.send(:define_method, :authenticate_user!) {} # rubocop:disable GitlabSecurity/PublicSend end yield.tap do diff --git a/lib/kramdown/converter/commonmark.rb b/lib/kramdown/converter/commonmark.rb index 4abb34cc00885..33ec9dd1fbc8e 100644 --- a/lib/kramdown/converter/commonmark.rb +++ b/lib/kramdown/converter/commonmark.rb @@ -34,7 +34,7 @@ def convert(el, opts = { indent: 0 }) def convert_codeblock(el, _opts) # Although tildes are supported in CommonMark, backticks are more common "```#{el.options[:lang]}\n" + - el.value.split(/\n/).map {|l| l.empty? ? "" : "#{l}" }.join("\n") + + el.value.split(/\n/).map { |l| l.empty? ? "" : "#{l}" }.join("\n") + "\n```\n\n" end @@ -43,7 +43,7 @@ def convert_li(el, opts) if el.children.first && el.children.first.type == :p && !el.children.first.options[:transparent] if el.children.size == 1 && @stack.last.children.last == el && - (@stack.last.children.any? {|c| c.children.first.type != :p } || @stack.last.children.size == 1) + (@stack.last.children.any? { |c| c.children.first.type != :p } || @stack.last.children.size == 1) # replace the end of block character res.sub!(/\^\n\z/m, "#{END_OF_BLOCK}\n") end @@ -82,7 +82,7 @@ def convert_tfoot(el, opts) def convert_tr(el, opts) return super unless @options[:html_tables] - "<tr>\n#{el.children.map {|c| convert(c, opts) }.join}</tr>\n" + "<tr>\n#{el.children.map { |c| convert(c, opts) }.join}</tr>\n" end def convert_td(el, opts) diff --git a/lib/release_highlights/validator/entry.rb b/lib/release_highlights/validator/entry.rb index b46605fdc37f8..2b4889e0131a9 100644 --- a/lib/release_highlights/validator/entry.rb +++ b/lib/release_highlights/validator/entry.rb @@ -71,7 +71,7 @@ def value_for(key) end def find_node(key) - entry.children.find {|node| node.try(:value) == key.to_s } + entry.children.find { |node| node.try(:value) == key.to_s } end end end diff --git a/lib/security/ci_configuration/sast_build_action.rb b/lib/security/ci_configuration/sast_build_action.rb index 73298bcd07085..448d4fbeacb24 100644 --- a/lib/security/ci_configuration/sast_build_action.rb +++ b/lib/security/ci_configuration/sast_build_action.rb @@ -33,8 +33,8 @@ def collect_analyzer_values(config, key) analyzer_variables = analyzer_variables_for(config, key) analyzer_variables['SAST_EXCLUDED_ANALYZERS'] = if key == :value config[:analyzers] - &.reject {|a| a[:enabled] } - &.collect {|a| a[:name] } + &.reject { |a| a[:enabled] } + &.collect { |a| a[:name] } &.sort &.join(', ') else @@ -46,9 +46,9 @@ def collect_analyzer_values(config, key) def analyzer_variables_for(config, key) config[:analyzers] - &.select {|a| a[:enabled] && a[:variables] } - &.flat_map {|a| a[:variables] } - &.collect {|v| [v[:field], v[key]] }.to_h + &.select { |a| a[:enabled] && a[:variables] } + &.flat_map { |a| a[:variables] } + &.collect { |v| [v[:field], v[key]] }.to_h end def update_existing_content! diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index 5ed54bb6921d4..30e0e3e72ffab 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -294,7 +294,7 @@ namespace :gitlab do # gc = Gitlab::CurrentSettings.current_application_settings seed_projects = [Gitlab::CurrentSettings.current_application_settings.self_monitoring_project] - if (Project.count - seed_projects.count {|x| !x.nil? }).eql?(0) + if (Project.count - seed_projects.count { |x| !x.nil? }).eql?(0) puts "No user created projects. Database not active" exit 1 end diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index 6f42bf8c946f8..161c7dd38ac83 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -19,7 +19,7 @@ namespace :gitlab do # check for system defined proxies if Gitlab.ee? - proxies = Gitlab::Proxy.detect_proxy.map {|k, v| "#{k}: #{v}"}.join("\n\t\t") + proxies = Gitlab::Proxy.detect_proxy.map { |k, v| "#{k}: #{v}" }.join("\n\t\t") end # check Go version diff --git a/lib/tasks/gitlab/praefect.rake b/lib/tasks/gitlab/praefect.rake index 0a34a00469015..6874a55e08a07 100644 --- a/lib/tasks/gitlab/praefect.rake +++ b/lib/tasks/gitlab/praefect.rake @@ -45,7 +45,7 @@ namespace :gitlab do header.concat(sorted_replicas.map { |r| r.repository.storage_name }) row = [project.name] << replicas_resp.primary.checksum - row.concat(sorted_replicas.map {|r| r.checksum}) + row.concat(sorted_replicas.map { |r| r.checksum }) rescue StandardError puts 'Something went wrong when getting replicas.' next diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake index 8627a32624701..cf9876366aa6b 100644 --- a/lib/tasks/gitlab/shell.rake +++ b/lib/tasks/gitlab/shell.rake @@ -27,7 +27,7 @@ namespace :gitlab do }.stringify_keys # Generate config.yml based on existing gitlab settings - File.open("config.yml", "w+") {|f| f.puts config.to_yaml } + File.open("config.yml", "w+") { |f| f.puts config.to_yaml } [ %w(bin/install) + repository_storage_paths_args, diff --git a/lib/tasks/gitlab/tw/codeowners.rake b/lib/tasks/gitlab/tw/codeowners.rake index 4d6e9fd303e8d..f6c518784a925 100644 --- a/lib/tasks/gitlab/tw/codeowners.rake +++ b/lib/tasks/gitlab/tw/codeowners.rake @@ -128,7 +128,7 @@ namespace :tw do if errors.present? puts "-----" puts "ERRORS - the following files are missing the correct metadata:" - errors.map { |file| puts file.gsub(Dir.pwd, ".")} + errors.map { |file| puts file.gsub(Dir.pwd, ".") } end end end diff --git a/rubocop/cop/migration/add_limit_to_text_columns.rb b/rubocop/cop/migration/add_limit_to_text_columns.rb index b5780e87c19d5..a47fbe0bf1683 100644 --- a/rubocop/cop/migration/add_limit_to_text_columns.rb +++ b/rubocop/cop/migration/add_limit_to_text_columns.rb @@ -104,7 +104,7 @@ def table_and_attribute_name(node) block_node = node.each_ancestor(:block).first create_table_node = block_node .children - .find { |n| TABLE_METHODS.include?(n.children[1])} + .find { |n| TABLE_METHODS.include?(n.children[1]) } if create_table_node table_name = create_table_node.children[2].value diff --git a/scripts/qa/testcases-check b/scripts/qa/testcases-check index 1d7a9d04e7b33..12af15fe73f99 100755 --- a/scripts/qa/testcases-check +++ b/scripts/qa/testcases-check @@ -51,9 +51,9 @@ tests.each do |test| end end -testcase_list = testcases.group_by {|testcase| testcase.shift}.transform_values(&:flatten) +testcase_list = testcases.group_by { |testcase| testcase.shift }.transform_values(&:flatten) -duplicates = testcase_list.select {|k, v| v.count > 1} +duplicates = testcase_list.select { |k, v| v.count > 1 } unless duplicates.empty? duplicates.each do |duplicate| diff --git a/spec/channels/awareness_channel_spec.rb b/spec/channels/awareness_channel_spec.rb index 2bc62a2d44a58..47b1cd0188fef 100644 --- a/spec/channels/awareness_channel_spec.rb +++ b/spec/channels/awareness_channel_spec.rb @@ -64,7 +64,7 @@ session = AwarenessSession.for("/test") expect { subscription.unsubscribe_from_channel } - .to change { session.size}.by(-1) + .to change { session.size }.by(-1) end end end diff --git a/spec/components/pajamas/banner_component_spec.rb b/spec/components/pajamas/banner_component_spec.rb index 26468d80c77cc..861b10c3f69e3 100644 --- a/spec/components/pajamas/banner_component_spec.rb +++ b/spec/components/pajamas/banner_component_spec.rb @@ -7,7 +7,7 @@ end let(:title) { "Banner title" } - let(:content) { "Banner content"} + let(:content) { "Banner content" } let(:options) { {} } describe 'basic usage' do diff --git a/spec/frontend/fixtures/integrations.rb b/spec/frontend/fixtures/integrations.rb index 1bafb0bfe788b..45d1c400f5de3 100644 --- a/spec/frontend/fixtures/integrations.rb +++ b/spec/frontend/fixtures/integrations.rb @@ -5,7 +5,7 @@ RSpec.describe Projects::Settings::IntegrationsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers - let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} + let(:namespace) { create(:namespace, name: 'frontend-fixtures' ) } let(:project) { create(:project_empty_repo, namespace: namespace, path: 'integrations-project') } let!(:service) { create(:custom_issue_tracker_integration, project: project) } let(:user) { project.first_owner } diff --git a/spec/frontend/fixtures/prometheus_integration.rb b/spec/frontend/fixtures/prometheus_integration.rb index 883dbb929a2b5..250c50bc8bb28 100644 --- a/spec/frontend/fixtures/prometheus_integration.rb +++ b/spec/frontend/fixtures/prometheus_integration.rb @@ -5,7 +5,7 @@ RSpec.describe Projects::Settings::IntegrationsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers - let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} + let(:namespace) { create(:namespace, name: 'frontend-fixtures' ) } let(:project) { create(:project_empty_repo, namespace: namespace, path: 'integrations-project') } let!(:integration) { create(:prometheus_integration, project: project) } let(:user) { project.first_owner } diff --git a/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb b/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb index 77611c98179f2..7828aa99f6a80 100644 --- a/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb +++ b/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb @@ -6,7 +6,7 @@ let_it_be(:project) { create(:project) } let(:supported_dast_versions) { described_class::SUPPORTED_VERSIONS[:dast].join(', ') } - let(:deprecated_schema_version_message) { } + let(:deprecated_schema_version_message) {} let(:missing_schema_version_message) do "Report version not provided, dast report type supports versions: #{supported_dast_versions}" end diff --git a/spec/lib/gitlab/memory/reports/jemalloc_stats_spec.rb b/spec/lib/gitlab/memory/reports/jemalloc_stats_spec.rb index 81bf5ce119ffe..53fae48776bf6 100644 --- a/spec/lib/gitlab/memory/reports/jemalloc_stats_spec.rb +++ b/spec/lib/gitlab/memory/reports/jemalloc_stats_spec.rb @@ -3,13 +3,13 @@ require 'spec_helper' RSpec.describe Gitlab::Memory::Reports::JemallocStats do - let(:reports_dir) {'/empty-dir'} + let(:reports_dir) { '/empty-dir' } let(:jemalloc_stats) { described_class.new(reports_path: reports_dir) } describe '.run' do context 'when :report_jemalloc_stats ops FF is enabled' do - let(:worker_id) {'puma_1'} - let(:report_name) {'report.json'} + let(:worker_id) { 'puma_1' } + let(:report_name) { 'report.json' } let(:report_path) { File.join(reports_dir, report_name) } before do diff --git a/spec/migrations/20220505174658_update_index_on_alerts_to_exclude_null_fingerprints_spec.rb b/spec/migrations/20220505174658_update_index_on_alerts_to_exclude_null_fingerprints_spec.rb index 0c4d0e8678994..ec58a54b085d7 100644 --- a/spec/migrations/20220505174658_update_index_on_alerts_to_exclude_null_fingerprints_spec.rb +++ b/spec/migrations/20220505174658_update_index_on_alerts_to_exclude_null_fingerprints_spec.rb @@ -4,7 +4,7 @@ require_migration! RSpec.describe UpdateIndexOnAlertsToExcludeNullFingerprints do - let(:alerts) { 'alert_management_alerts'} + let(:alerts) { 'alert_management_alerts' } let(:old_index) { described_class::OLD_INDEX_NAME } let(:new_index) { described_class::NEW_INDEX_NAME } diff --git a/spec/models/merge_request/approval_removal_settings_spec.rb b/spec/models/merge_request/approval_removal_settings_spec.rb index e84fd403a55e4..5f879207a72da 100644 --- a/spec/models/merge_request/approval_removal_settings_spec.rb +++ b/spec/models/merge_request/approval_removal_settings_spec.rb @@ -4,8 +4,8 @@ RSpec.describe MergeRequest::ApprovalRemovalSettings do describe 'validations' do - let(:reset_approvals_on_push) { } - let(:selective_code_owner_removals) { } + let(:reset_approvals_on_push) {} + let(:selective_code_owner_removals) {} subject { described_class.new(project, reset_approvals_on_push, selective_code_owner_removals) } diff --git a/spec/policies/timelog_policy_spec.rb b/spec/policies/timelog_policy_spec.rb index 97e61cfe5cea5..31912c637ce5d 100644 --- a/spec/policies/timelog_policy_spec.rb +++ b/spec/policies/timelog_policy_spec.rb @@ -6,7 +6,7 @@ let_it_be(:author) { create(:user) } let_it_be(:project) { create(:project, :public) } let_it_be(:issue) { create(:issue, project: project) } - let_it_be(:timelog) { create(:timelog, user: author, issue: issue, time_spent: 1800)} + let_it_be(:timelog) { create(:timelog, user: author, issue: issue, time_spent: 1800) } let(:user) { nil } let(:policy) { described_class.new(user, timelog) } diff --git a/spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb b/spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb index be454e5168cab..c966b1fc8e192 100644 --- a/spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb +++ b/spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb @@ -59,7 +59,7 @@ let(:project_or_group) { project } - it { is_expected.not_to include(package_file_pending_destruction.file_name)} + it { is_expected.not_to include(package_file_pending_destruction.file_name) } end end end diff --git a/spec/scripts/changed-feature-flags_spec.rb b/spec/scripts/changed-feature-flags_spec.rb index bbae49a90e4b8..f4058614d859c 100644 --- a/spec/scripts/changed-feature-flags_spec.rb +++ b/spec/scripts/changed-feature-flags_spec.rb @@ -81,8 +81,8 @@ end describe '.extracted_flags' do - let(:file_name1) { "foo_ff_#{SecureRandom.hex(8)}"} - let(:file_name2) { "bar_ff_#{SecureRandom.hex(8)}"} + let(:file_name1) { "foo_ff_#{SecureRandom.hex(8)}" } + let(:file_name2) { "bar_ff_#{SecureRandom.hex(8)}" } let(:ff_dir) { FileUtils.mkdir_p(File.join(Dir.tmpdir, ff_sub_dir)) } let(:diffs_dir) { FileUtils.mkdir_p(File.join(Dir.tmpdir, 'diffs')).first } diff --git a/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb b/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb index c39eb14e339d1..7ea7235159475 100644 --- a/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb @@ -6,8 +6,8 @@ include RequestAwareEntity let(:user) { create(:user) } - let(:project) { create(:project, :internal)} - let(:project_private) { create(:project, :private)} + let(:project) { create(:project, :internal) } + let(:project_private) { create(:project, :private) } let(:deploy_key) { create(:deploy_key) } let(:options) { { user: user } } diff --git a/spec/serializers/deploy_keys/deploy_key_entity_spec.rb b/spec/serializers/deploy_keys/deploy_key_entity_spec.rb index e989aa8656c80..7719cafae1142 100644 --- a/spec/serializers/deploy_keys/deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_keys/deploy_key_entity_spec.rb @@ -6,8 +6,8 @@ include RequestAwareEntity let(:user) { create(:user) } - let(:project) { create(:project, :internal)} - let(:project_private) { create(:project, :private)} + let(:project) { create(:project, :internal) } + let(:project_private) { create(:project, :private) } let(:deploy_key) { create(:deploy_key) } let(:options) { { user: user } } diff --git a/spec/services/ci/runners/bulk_delete_runners_service_spec.rb b/spec/services/ci/runners/bulk_delete_runners_service_spec.rb index 2fc13831c31ad..8e9fc4e301277 100644 --- a/spec/services/ci/runners/bulk_delete_runners_service_spec.rb +++ b/spec/services/ci/runners/bulk_delete_runners_service_spec.rb @@ -6,7 +6,7 @@ subject(:execute) { described_class.new(**service_args).execute } let(:service_args) { { runners: runners_arg } } - let(:runners_arg) { } + let(:runners_arg) {} context 'with runners specified' do let!(:instance_runner) { create(:ci_runner) } diff --git a/spec/services/work_items/widgets/assignees_service/update_service_spec.rb b/spec/services/work_items/widgets/assignees_service/update_service_spec.rb index 48927c4b05b4b..0ab2c85f078df 100644 --- a/spec/services/work_items/widgets/assignees_service/update_service_spec.rb +++ b/spec/services/work_items/widgets/assignees_service/update_service_spec.rb @@ -11,7 +11,7 @@ create(:work_item, project: project, updated_at: 1.day.ago) end - let(:widget) { work_item.widgets.find {|widget| widget.is_a?(WorkItems::Widgets::Assignees) } } + let(:widget) { work_item.widgets.find { |widget| widget.is_a?(WorkItems::Widgets::Assignees) } } let(:current_user) { reporter } let(:params) { { assignee_ids: [new_assignee.id] } } diff --git a/spec/services/work_items/widgets/start_and_due_date_service/update_service_spec.rb b/spec/services/work_items/widgets/start_and_due_date_service/update_service_spec.rb index 972a17c305226..d328c541fc7f7 100644 --- a/spec/services/work_items/widgets/start_and_due_date_service/update_service_spec.rb +++ b/spec/services/work_items/widgets/start_and_due_date_service/update_service_spec.rb @@ -7,7 +7,7 @@ let_it_be(:project) { create(:project) } let_it_be_with_reload(:work_item) { create(:work_item, project: project) } - let(:widget) { work_item.widgets.find {|widget| widget.is_a?(WorkItems::Widgets::StartAndDueDate) } } + let(:widget) { work_item.widgets.find { |widget| widget.is_a?(WorkItems::Widgets::StartAndDueDate) } } describe '#before_update_callback' do let(:start_date) { Date.today } diff --git a/spec/support/helpers/graphql_helpers.rb b/spec/support/helpers/graphql_helpers.rb index 9ff59d4b6f336..d78c523decd6d 100644 --- a/spec/support/helpers/graphql_helpers.rb +++ b/spec/support/helpers/graphql_helpers.rb @@ -170,7 +170,7 @@ def resolve_field( # or `prepare` in app/graphql/types/range_input_type.rb, used by Types::TimeframeInputType def args_internal(field, args:, query_ctx:, parent:, extras:, query:) arguments = GraphqlHelpers.deep_transform_args(args, field) - arguments.merge!(extras.reject {|k, v| v == :not_given}) + arguments.merge!(extras.reject { |k, v| v == :not_given }) end # Pros: @@ -185,7 +185,7 @@ def args_internal(field, args:, query_ctx:, parent:, extras:, query:) # take internal style args, and force them into client style args def args_internal_prepared(field, args:, query_ctx:, parent:, extras:, query:) arguments = GraphqlHelpers.as_graphql_argument_literals(args) - arguments.merge!(extras.reject {|k, v| v == :not_given}) + arguments.merge!(extras.reject { |k, v| v == :not_given }) # Use public API to properly prepare the args for use by the resolver. # It uses `coerce_arguments` under the covers diff --git a/spec/support/shared_examples/helpers/wiki_helpers_shared_examples.rb b/spec/support/shared_examples/helpers/wiki_helpers_shared_examples.rb index c2c27fb65ca37..61c8a3f47dfc7 100644 --- a/spec/support/shared_examples/helpers/wiki_helpers_shared_examples.rb +++ b/spec/support/shared_examples/helpers/wiki_helpers_shared_examples.rb @@ -2,7 +2,7 @@ RSpec.shared_examples 'wiki endpoint helpers' do let(:resource_path) { page.wiki.container.class.to_s.pluralize.downcase } - let(:url) { "/api/v4/#{resource_path}/#{page.wiki.container.id}/wikis/#{page.slug}?version=#{page.version.id}"} + let(:url) { "/api/v4/#{resource_path}/#{page.wiki.container.id}/wikis/#{page.slug}?version=#{page.version.id}" } it 'returns the full endpoint url' do expect(helper.wiki_page_render_api_endpoint(page)).to end_with(url) diff --git a/spec/views/devise/sessions/new.html.haml_spec.rb b/spec/views/devise/sessions/new.html.haml_spec.rb index c41e9eb716292..c8e9aa15287c4 100644 --- a/spec/views/devise/sessions/new.html.haml_spec.rb +++ b/spec/views/devise/sessions/new.html.haml_spec.rb @@ -71,7 +71,7 @@ end describe 'Google Tag Manager' do - let!(:gtm_id) { 'GTM-WWKMTWS'} + let!(:gtm_id) { 'GTM-WWKMTWS' } subject { rendered } diff --git a/spec/workers/packages/cleanup/execute_policy_worker_spec.rb b/spec/workers/packages/cleanup/execute_policy_worker_spec.rb index 81fcec1a36024..6325a82ed3d59 100644 --- a/spec/workers/packages/cleanup/execute_policy_worker_spec.rb +++ b/spec/workers/packages/cleanup/execute_policy_worker_spec.rb @@ -113,7 +113,7 @@ def expect_log_extra_metadata(key, value) end describe '#remaining_work_count' do - subject { worker.remaining_work_count} + subject { worker.remaining_work_count } context 'with no policies' do it { is_expected.to eq(0) } -- GitLab