Regenerate .rubocop_todo.yml and track Style/HashTransformation

8c8e8201 · Peter Leitzen · f2f14ae7 · 8c8e8201 · 8c8e8201
Commit 8c8e8201 authored Feb 24, 2021 by Peter Leitzen
Show whitespace changes
Inline Side-by-side

Showing with 217 additions and 141 deletions

.rubocop_manual_todo.yml .rubocop_manual_todo.yml +66 -0

.rubocop_todo.yml .rubocop_todo.yml +151 -141

No files found.
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -2456,3 +2456,69 @@ Gitlab/NamespacedClass:
    - 'spec/support/sidekiq_middleware.rb'
    - 'spec/tasks/gitlab/task_helpers_spec.rb'
    - 'spec/uploaders/object_storage_spec.rb'
+
+# WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/322739
+Style/HashTransformation:
+  Exclude:
+    - 'app/controllers/projects/branches_controller.rb'
+    - 'app/finders/ci/commit_statuses_finder.rb'
+    - 'app/helpers/learn_gitlab_helper.rb'
+    - 'app/models/ci/build_trace_chunk.rb'
+    - 'app/models/concerns/cache_markdown_field.rb'
+    - 'app/models/gpg_key.rb'
+    - 'app/presenters/packages/npm/package_presenter.rb'
+    - 'app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb'
+    - 'app/services/ci/retry_build_service.rb'
+    - 'app/services/packages/nuget/create_dependency_service.rb'
+    - 'ee/app/models/ee/ci/build.rb'
+    - 'ee/app/models/productivity_analytics.rb'
+    - 'ee/app/models/sca/license_compliance.rb'
+    - 'ee/app/services/security/store_report_service.rb'
+    - 'ee/lib/ee/gitlab/auth/ldap/sync/group.rb'
+    - 'ee/lib/ee/gitlab/usage_data.rb'
+    - 'ee/lib/gitlab/custom_file_templates.rb'
+    - 'ee/spec/elastic_integration/global_search_spec.rb'
+    - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
+    - 'lib/api/helpers/packages/conan/api_helpers.rb'
+    - 'lib/api/projects.rb'
+    - 'lib/atlassian/jira_connect/client.rb'
+    - 'lib/banzai/filter/repository_link_filter.rb'
+    - 'lib/gitlab/ci/config/entry/product/variables.rb'
+    - 'lib/gitlab/ci/config/entry/variables.rb'
+    - 'lib/gitlab/ci/variables/collection.rb'
+    - 'lib/gitlab/ci/variables/helpers.rb'
+    - 'lib/gitlab/git/commit.rb'
+    - 'lib/gitlab/import_sources.rb'
+    - 'lib/gitlab/language_detection.rb'
+    - 'lib/gitlab/metrics/samplers/database_sampler.rb'
+    - 'lib/gitlab/metrics/subscribers/active_record.rb'
+    - 'lib/gitlab/phabricator_import/project_creator.rb'
+    - 'lib/gitlab/prometheus_client.rb'
+    - 'lib/gitlab/repository_hash_cache.rb'
+    - 'lib/gitlab/static_site_editor/config/file_config.rb'
+    - 'lib/gitlab/template/base_template.rb'
+    - 'lib/gitlab/usage_data_counters/base_counter.rb'
+    - 'lib/gitlab/usage_data_counters/note_counter.rb'
+    - 'spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb'
+    - 'spec/lib/gitlab/ci/status/composite_spec.rb'
+    - 'spec/lib/gitlab/conflict/file_spec.rb'
+    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
+    - 'spec/models/concerns/featurable_spec.rb'
+    - 'spec/models/event_spec.rb'
+    - 'spec/models/packages/dependency_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/todos_spec.rb'
+    - 'spec/requests/api/projects_spec.rb'
+    - 'spec/support/helpers/graphql_helpers.rb'
+    - 'spec/support/import_export/project_tree_expectations.rb'
+    - 'spec/support/shared_contexts/services/projects/container_repository/delete_tags_service_shared_context.rb'
+
+Style/ClassEqualityComparison:
+  Exclude:
+    - spec/lib/peek/views/active_record_spec.rb
+    - ee/spec/lib/peek/views/active_record_spec.rb
+
+Lint/HashCompareByIdentity:
+  Exclude:
+    - ee/lib/gitlab/database/load_balancing/load_balancer.rb
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-01-11 15:49:32 UTC using RuboCop version 0.91.1.
+# on 2021-02-24 14:52:20 UTC using RuboCop version 0.93.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.

-# Offense count: 313
+# Offense count: 314
 # Cop supports --auto-correct.
 Capybara/CurrentPathExpectation:
  Enabled: false

-# Offense count: 218
+# Offense count: 221
 Capybara/VisibilityMatcher:
  Enabled: false

@@ -25,7 +25,7 @@ Graphql/IDType:
  Exclude:
    - 'app/graphql/mutations/boards/issues/issue_move_list.rb'

-# Offense count: 2054
+# Offense count: 2270
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
@@ -50,28 +50,28 @@ Layout/BeginEndAlignment:
    - 'lib/gitlab/phabricator_import/project_creator.rb'
    - 'scripts/gitaly_test.rb'

-# Offense count: 52
+# Offense count: 54
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAliasSyntax, AllowedMethods.
 # AllowedMethods: alias_method, public, protected, private
 Layout/EmptyLinesAroundAttributeAccessor:
  Enabled: false

-# Offense count: 721
+# Offense count: 771
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Layout/FirstArrayElementIndentation:
  Enabled: false

-# Offense count: 1592
+# Offense count: 1684
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
  Enabled: false

-# Offense count: 3019
+# Offense count: 3233
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -80,14 +80,14 @@ Layout/FirstHashElementIndentation:
 Layout/HashAlignment:
  Enabled: false

-# Offense count: 73
+# Offense count: 14544
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
  Max: 1313

-# Offense count: 163
+# Offense count: 170
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
@@ -113,22 +113,23 @@ Layout/RescueEnsureAlignment:
 Layout/SpaceAroundMethodCallOperator:
  Enabled: false

-# Offense count: 725
+# Offense count: 754
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_no_space, require_space
 Layout/SpaceInLambdaLiteral:
  Enabled: false

-# Offense count: 218
+# Offense count: 1209
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# Configuration parameters: EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
  Enabled: false
+  EnforcedStyle: space

-# Offense count: 559
+# Offense count: 585
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
@@ -141,7 +142,6 @@ Lint/BinaryOperatorWithIdenticalOperands:
    - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
    - 'spec/helpers/visibility_level_helper_spec.rb'
    - 'spec/lib/gitlab/conan_token_spec.rb'
-    - 'spec/tooling/danger/sidekiq_queues_spec.rb'
    - 'spec/lib/gitlab/git/conflict/parser_spec.rb'
    - 'spec/lib/gitlab/graphql/lazy_spec.rb'
    - 'spec/models/ci/build_trace_chunk_spec.rb'
@@ -150,8 +150,9 @@ Lint/BinaryOperatorWithIdenticalOperands:
    - 'spec/models/metrics/dashboard/annotation_spec.rb'
    - 'spec/models/repository_spec.rb'
    - 'spec/models/ssh_host_key_spec.rb'
+    - 'spec/tooling/danger/sidekiq_queues_spec.rb'

-# Offense count: 83
+# Offense count: 84
 Lint/ConstantDefinitionInBlock:
  Enabled: false

@@ -174,12 +175,12 @@ Lint/IdentityComparison:
    - 'spec/tooling/danger/weightage/maintainers_spec.rb'
    - 'spec/tooling/danger/weightage/reviewers_spec.rb'

-# Offense count: 184
+# Offense count: 208
 # Configuration parameters: MaximumRangeSize.
 Lint/MissingCopEnableDirective:
  Enabled: false

-# Offense count: 14
+# Offense count: 13
 Lint/MixedRegexpCaptureTypes:
  Exclude:
    - 'app/models/alert_management/alert.rb'
@@ -188,7 +189,6 @@ Lint/MixedRegexpCaptureTypes:
    - 'ee/lib/gitlab/code_owners/reference_extractor.rb'
    - 'lib/gitlab/ci/pipeline/expression/lexeme/string.rb'
    - 'lib/gitlab/dependency_linker/gemfile_linker.rb'
-    - 'lib/gitlab/diff/inline_diff.rb'
    - 'lib/gitlab/diff/suggestions_parser.rb'
    - 'lib/gitlab/github_import/representation/note.rb'
    - 'lib/gitlab/metrics/system.rb'
@@ -197,11 +197,26 @@ Lint/MixedRegexpCaptureTypes:
    - 'lib/gitlab/slash_commands/issue_new.rb'
    - 'lib/gitlab/slash_commands/run.rb'

-# Offense count: 141
+# Offense count: 200
 # Cop supports --auto-correct.
 Lint/RedundantCopDisableDirective:
  Enabled: false

+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
+Lint/RedundantSafeNavigation:
+  Exclude:
+    - 'app/controllers/concerns/labels_as_hash.rb'
+    - 'app/policies/note_policy.rb'
+    - 'app/services/users/update_canonical_email_service.rb'
+    - 'ee/app/presenters/iteration_presenter.rb'
+    - 'ee/app/services/ee/members/destroy_service.rb'
+    - 'ee/lib/ee/gitlab/email/handler/reply_processing.rb'
+    - 'qa/qa/specs/helpers/quarantine.rb'
+    - 'spec/controllers/boards/issues_controller_spec.rb'
+
 # Offense count: 1
 Lint/SelfAssignment:
  Exclude:
@@ -225,57 +240,20 @@ Lint/UnreachableLoop:
 Lint/UselessMethodDefinition:
  Enabled: false

-# Offense count: 7
-# Configuration parameters: IgnoredMethods, Max.
+# Offense count: 5
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Exclude:
-    - 'app/helpers/issuables_helper.rb'
-    - 'app/services/merge_requests/build_service.rb'
-    - 'app/services/projects/create_service.rb'
-    - 'lib/api/helpers.rb'
-    - 'lib/gitlab/lograge/custom_options.rb'
-    - 'lib/gitlab/rack_attack.rb'
-    - 'qa/qa/resource/repository/push.rb'
+  Max: 61

-# Offense count: 15
-# Configuration parameters: IgnoredMethods, Max.
+# Offense count: 13
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Exclude:
-    - 'app/services/projects/create_service.rb'
-    - 'app/services/system_hooks_service.rb'
-    - 'ee/app/controllers/ee/groups_controller.rb'
-    - 'ee/app/helpers/ee/groups_helper.rb'
-    - 'ee/lib/security/ci_configuration/sast_build_actions.rb'
-    - 'lib/banzai/filter/abstract_reference_filter.rb'
-    - 'lib/declarative_policy/runner.rb'
-    - 'lib/gitlab/conflict/file.rb'
-    - 'tooling/danger/roulette.rb'
-    - 'lib/gitlab/diff/parser.rb'
-    - 'lib/gitlab/rack_attack.rb'
-    - 'lib/gitlab/sidekiq_cluster/cli.rb'
-    - 'lib/gitlab/utils/merge_hash.rb'
-    - 'lib/kramdown/parser/atlassian_document_format.rb'
-    - 'spec/support/cycle_analytics_helpers/test_generation.rb'
+  Max: 25

-# Offense count: 15
-# Configuration parameters: IgnoredMethods, Max.
+# Offense count: 14
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Exclude:
-    - 'app/helpers/submodule_helper.rb'
-    - 'app/helpers/tab_helper.rb'
-    - 'app/services/projects/create_service.rb'
-    - 'ee/app/controllers/ee/groups_controller.rb'
-    - 'ee/app/helpers/ee/groups_helper.rb'
-    - 'ee/lib/security/ci_configuration/sast_build_actions.rb'
-    - 'lib/banzai/filter/abstract_reference_filter.rb'
-    - 'lib/banzai/renderer.rb'
-    - 'lib/declarative_policy/runner.rb'
-    - 'lib/gitlab/conflict/file.rb'
-    - 'tooling/danger/roulette.rb'
-    - 'lib/gitlab/rack_attack.rb'
-    - 'lib/gitlab/sidekiq_cluster/cli.rb'
-    - 'lib/gitlab/utils/merge_hash.rb'
-    - 'spec/support/cycle_analytics_helpers/test_generation.rb'
+  Max: 25

 # Offense count: 1
 # Cop supports --auto-correct.
@@ -283,7 +261,7 @@ Migration/DepartmentName:
  Exclude:
    - 'app/models/commit.rb'

-# Offense count: 184
+# Offense count: 196
 # Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
@@ -300,7 +278,7 @@ Naming/HeredocDelimiterCase:
    - 'spec/support/helpers/repo_helpers.rb'
    - 'spec/support/helpers/seed_repo.rb'

-# Offense count: 308
+# Offense count: 321
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -314,7 +292,7 @@ Naming/MethodParameterName:
    - 'lib/gitlab/diff/inline_diff.rb'
    - 'spec/support/helpers/key_generator_helper.rb'

-# Offense count: 206
+# Offense count: 218
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredName.
 Naming/RescuedExceptionsVariableName:
@@ -326,17 +304,17 @@ Performance/AncestorsInclude:
  Exclude:
    - 'lib/gitlab/ci/config/extendable/entry.rb'

-# Offense count: 39
+# Offense count: 40
 # Cop supports --auto-correct.
 Performance/BlockGivenWithExplicitBlock:
  Enabled: false

-# Offense count: 28
+# Offense count: 29
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
  Enabled: false

-# Offense count: 37
+# Offense count: 41
 # Cop supports --auto-correct.
 Performance/ConstantRegexp:
  Enabled: false
@@ -394,7 +372,7 @@ Performance/Detect:
    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
    - 'spec/models/event_spec.rb'

-# Offense count: 116
+# Offense count: 121
 Performance/MethodObjectAsBlock:
  Enabled: false

@@ -438,7 +416,7 @@ Performance/Sum:
    - 'lib/peek/views/detailed_view.rb'
    - 'spec/models/namespace/root_storage_statistics_spec.rb'

-# Offense count: 14717
+# Offense count: 15209
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -451,14 +429,14 @@ RSpec/EmptyExampleGroup:
    - 'ee/spec/services/personal_access_tokens/revoke_invalid_tokens_spec.rb'
    - 'spec/services/projects/prometheus/alerts/notify_service_spec.rb'

-# Offense count: 1365
+# Offense count: 1428
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: method_call, block
 RSpec/ExpectChange:
  Enabled: false

-# Offense count: 889
+# Offense count: 930
 RSpec/ExpectInHook:
  Enabled: false

@@ -469,27 +447,27 @@ RSpec/ExpectInHook:
 RSpec/PredicateMatcher:
  Enabled: false

-# Offense count: 112
+# Offense count: 118
 RSpec/RepeatedExampleGroupBody:
  Enabled: false

-# Offense count: 219
+# Offense count: 225
 RSpec/RepeatedExampleGroupDescription:
  Enabled: false

-# Offense count: 655
+# Offense count: 667
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: and_return, block
 RSpec/ReturnFromStub:
  Enabled: false

-# Offense count: 596
+# Offense count: 610
 # Cop supports --auto-correct.
 RSpec/ScatteredLet:
  Enabled: false

-# Offense count: 6
+# Offense count: 4
 RSpec/ScatteredSetup:
  Exclude:
    - 'spec/requests/api/jobs_spec.rb'
@@ -514,7 +492,7 @@ RSpec/VariableName:
    - 'spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb'
    - 'spec/support/shared_examples/services/boards/boards_list_service_shared_examples.rb'

-# Offense count: 25
+# Offense count: 26
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -543,25 +521,25 @@ Rails/BelongsTo:
    - 'app/models/deployment.rb'
    - 'app/models/environment.rb'

-# Offense count: 90
+# Offense count: 93
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Include: db/migrate/*.rb
 Rails/BulkChangeTable:
  Enabled: false

-# Offense count: 153
+# Offense count: 155
 # Cop supports --auto-correct.
 Rails/ContentTag:
  Enabled: false

-# Offense count: 300
+# Offense count: 313
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 Rails/CreateTableWithTimestamps:
  Enabled: false

-# Offense count: 347
+# Offense count: 361
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
@@ -583,13 +561,13 @@ Rails/FindById:
    - 'spec/finders/concerns/finder_methods_spec.rb'
    - 'spec/finders/concerns/finder_with_cross_project_access_spec.rb'

-# Offense count: 346
+# Offense count: 354
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
  Enabled: false

-# Offense count: 539
+# Offense count: 537
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -609,11 +587,11 @@ Rails/IndexBy:
    - 'ee/lib/gitlab/analytics/type_of_work/tasks_by_type.rb'
    - 'ee/lib/gitlab/elastic/document_reference.rb'
    - 'ee/lib/gitlab/group_plans_preloader.rb'
-    - 'tooling/danger/sidekiq_queues.rb'
    - 'lib/gitlab/database/count/reltuples_count_strategy.rb'
    - 'lib/gitlab/language_detection.rb'
+    - 'tooling/danger/sidekiq_queues.rb'

-# Offense count: 45
+# Offense count: 47
 # Cop supports --auto-correct.
 Rails/IndexWith:
  Enabled: false
@@ -623,24 +601,23 @@ Rails/Inquiry:
  Exclude:
    - 'spec/helpers/labels_helper_spec.rb'

-# Offense count: 115
+# Offense count: 118
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/InverseOf:
  Enabled: false

-# Offense count: 60
+# Offense count: 62
 # Configuration parameters: Include.
 # Include: app/controllers/**/*.rb
 Rails/LexicallyScopedActionFilter:
  Enabled: false

-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 Rails/LinkToBlank:
  Exclude:
    - 'app/helpers/projects_helper.rb'
-    - 'app/helpers/wiki_helper.rb'
    - 'ee/app/helpers/ee/user_callouts_helper.rb'

 # Offense count: 1
@@ -656,12 +633,12 @@ Rails/MailerName:
 Rails/NegateInclude:
  Enabled: false

-# Offense count: 44
+# Offense count: 46
 # Cop supports --auto-correct.
 Rails/Pick:
  Enabled: false

-# Offense count: 110
+# Offense count: 123
 # Cop supports --auto-correct.
 Rails/Pluck:
  Enabled: false
@@ -673,7 +650,7 @@ Rails/Pluck:
 Rails/RakeEnvironment:
  Enabled: false

-# Offense count: 58
+# Offense count: 62
 # Cop supports --auto-correct.
 Rails/RedundantForeignKey:
  Enabled: false
@@ -693,23 +670,23 @@ Rails/ShortI18n:
    - 'app/uploaders/content_type_whitelist.rb'
    - 'spec/views/shared/runners/show.html.haml_spec.rb'

-# Offense count: 1080
+# Offense count: 1144
 # Configuration parameters: ForbiddenMethods, AllowedMethods.
 # ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
 Rails/SkipsModelValidations:
  Enabled: false

-# Offense count: 251
+# Offense count: 278
 # Cop supports --auto-correct.
 Rails/SquishedSQLHeredocs:
  Enabled: false

-# Offense count: 45
+# Offense count: 44
 # Cop supports --auto-correct.
 Rails/WhereEquals:
  Enabled: false

-# Offense count: 40
+# Offense count: 44
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: exists, where
@@ -738,7 +715,7 @@ Security/YAMLLoad:
 Style/AccessorGrouping:
  Enabled: false

-# Offense count: 12
+# Offense count: 11
 # Cop supports --auto-correct.
 Style/ArrayCoercion:
  Exclude:
@@ -750,12 +727,11 @@ Style/ArrayCoercion:
    - 'db/post_migrate/20200311130802_schedule_populate_user_highest_roles_table.rb'
    - 'db/post_migrate/20200805152108_migrate_null_external_diff_store_to_local_value.rb'
    - 'db/post_migrate/20200806173633_migrate_null_package_files_file_store_to_local_value.rb'
-    - 'ee/app/services/geo/blob_verification_secondary_service.rb'
    - 'ee/app/services/geo/repository_verification_secondary_service.rb'
    - 'ee/lib/ee/banzai/pipeline/gfm_pipeline.rb'
    - 'spec/support/helpers/lfs_http_helpers.rb'

-# Offense count: 183
+# Offense count: 188
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: percent_q, bare_percent
@@ -769,20 +745,35 @@ Style/BisectedAttrAccessor:
    - 'lib/system_check/base_check.rb'
    - 'qa/qa/resource/api_fabricator.rb'

-# Offense count: 36
+# Offense count: 42
 # Cop supports --auto-correct.
 Style/CaseLikeIf:
  Enabled: false

-# Offense count: 15
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: ==, equal?, eql?
+Style/ClassEqualityComparison:
+  Exclude:
+    - 'app/finders/security/jobs_finder.rb'
+    - 'app/services/projects/overwrite_project_service.rb'
+    - 'app/uploaders/dependency_proxy/file_uploader.rb'
+    - 'ee/app/graphql/resolvers/vulnerabilities/issue_links_resolver.rb'
+    - 'lib/gitlab/background_migration/user_mentions/models/note.rb'
+    - 'lib/gitlab/diff/file.rb'
+    - 'lib/gitlab/git.rb'
+    - 'lib/gitlab/import_export/relation_tree_restorer.rb'
+    - 'spec/requests/api/services_spec.rb'
+    - 'spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb'
+
+# Offense count: 13
 Style/CombinableLoops:
  Exclude:
-    - 'app/models/application_setting.rb'
    - 'ee/db/fixtures/development/30_customizable_cycle_analytics.rb'
    - 'ee/lib/gitlab/audit/events/preloader.rb'
    - 'ee/spec/finders/snippets_finder_spec.rb'
    - 'ee/spec/lib/ee/gitlab/background_migration/remove_duplicate_cs_findings_spec.rb'
-    - 'rubocop/code_reuse_helpers.rb'
    - 'spec/features/merge_request/user_suggests_changes_on_diff_spec.rb'
    - 'spec/finders/packages/group_packages_finder_spec.rb'
    - 'spec/migrations/cleanup_optimistic_locking_nulls_pt2_fixed_spec.rb'
@@ -808,14 +799,14 @@ Style/EachWithObject:
    - 'lib/gitlab/i18n/po_linter.rb'
    - 'lib/gitlab/import_export/members_mapper.rb'

-# Offense count: 53
+# Offense count: 55
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty, nil, both
 Style/EmptyElse:
  Enabled: false

-# Offense count: 197
+# Offense count: 205
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
@@ -829,66 +820,75 @@ Style/ExpandPathArguments:
    - 'cable/config.ru'
    - 'config.ru'

-# Offense count: 116
+# Offense count: 118
 # Cop supports --auto-correct.
 Style/ExplicitBlockArgument:
  Enabled: false

-# Offense count: 555
+# Offense count: 581
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
  Enabled: false

-# Offense count: 61
+# Offense count: 67
 # Cop supports --auto-correct.
 Style/GlobalStdStream:
  Enabled: false

-# Offense count: 879
+# Offense count: 897
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
  Enabled: false

-# Offense count: 56
+# Offense count: 59
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: braces, no_braces
 Style/HashAsLastArrayItem:
  Enabled: false

-# Offense count: 66
+# Offense count: 70
 # Cop supports --auto-correct.
 Style/HashEachMethods:
  Enabled: false

-# Offense count: 33
+# Offense count: 34
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
  Enabled: false

-# Offense count: 1888
+# Offense count: 1934
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
  Enabled: false

-# Offense count: 68
+# Offense count: 64
 # Cop supports --auto-correct.
 Style/KeywordParametersOrder:
  Enabled: false

-# Offense count: 431
+# Offense count: 458
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: line_count_dependent, lambda, literal
 Style/Lambda:
  Enabled: false

-# Offense count: 20
+# Offense count: 21
 Style/MissingRespondToMissing:
  Enabled: false

+# Offense count: 5
+Style/MixinUsage:
+  Exclude:
+    - 'spec/factories/ci/builds.rb'
+    - 'spec/factories/ci/job_artifacts.rb'
+    - 'spec/factories/lfs_objects.rb'
+    - 'spec/factories/notes.rb'
+    - 'spec/lib/gitlab/import_export/version_checker_spec.rb'
+
 # Offense count: 35
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength.
@@ -896,36 +896,44 @@ Style/MissingRespondToMissing:
 Style/Next:
  Enabled: false

-# Offense count: 98
+# Offense count: 101
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
  Enabled: false

-# Offense count: 135
+# Offense count: 140
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
  Enabled: false

-# Offense count: 2601
+# Offense count: 2698
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
  Enabled: false

-# Offense count: 1
+# Offense count: 247
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: .
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
  Enabled: false
+  EnforcedStyle: exploded

-# Offense count: 65
+# Offense count: 73
 # Cop supports --auto-correct.
 Style/RedundantAssignment:
  Enabled: false

+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'app/services/clusters/applications/check_installation_progress_service.rb'
+    - 'lib/gitlab/database/postgres_hll/batch_distinct_counter.rb'
+
 # Offense count: 26
 # Cop supports --auto-correct.
 # Configuration parameters: SafeForConstants.
@@ -943,21 +951,23 @@ Style/RedundantFetchBlock:
 Style/RedundantFileExtensionInRequire:
  Enabled: false

-# Offense count: 220
+# Offense count: 248
 # Cop supports --auto-correct.
 Style/RedundantFreeze:
  Enabled: false

-# Offense count: 182
+# Offense count: 206
 # Cop supports --auto-correct.
 Style/RedundantInterpolation:
  Enabled: false

-# Offense count: 8
+# Offense count: 10
 # Cop supports --auto-correct.
 Style/RedundantRegexpCharacterClass:
  Exclude:
    - 'app/models/concerns/taskable.rb'
+    - 'ee/app/models/saml_provider.rb'
+    - 'lib/banzai/filter/markdown_pre_escape_filter.rb'
    - 'lib/gitlab/authorized_keys.rb'
    - 'lib/gitlab/fogbugz_import/repository.rb'
    - 'lib/gitlab/quick_actions/substitution_definition.rb'
@@ -965,12 +975,12 @@ Style/RedundantRegexpCharacterClass:
    - 'spec/features/merge_request/user_views_open_merge_request_spec.rb'
    - 'spec/tasks/gitlab/usage_data_rake_spec.rb'

-# Offense count: 270
+# Offense count: 279
 # Cop supports --auto-correct.
 Style/RedundantRegexpEscape:
  Enabled: false

-# Offense count: 920
+# Offense count: 968
 # Cop supports --auto-correct.
 Style/RedundantSelf:
  Enabled: false
@@ -982,26 +992,26 @@ Style/RedundantSelfAssignment:
    - 'app/models/concerns/issuable.rb'
    - 'spec/db/schema_spec.rb'

-# Offense count: 196
+# Offense count: 213
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
  Enabled: false

-# Offense count: 50
+# Offense count: 53
 # Cop supports --auto-correct.
 Style/RescueModifier:
  Enabled: false

-# Offense count: 346
+# Offense count: 359
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
  Enabled: false

-# Offense count: 115
+# Offense count: 123
 # Cop supports --auto-correct.
 Style/SingleArgumentDig:
  Enabled: false
@@ -1011,31 +1021,31 @@ Style/SingleArgumentDig:
 Style/SlicingWithRange:
  Enabled: false

-# Offense count: 61
+# Offense count: 63
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
  Enabled: false

-# Offense count: 121
+# Offense count: 120
 # Cop supports --auto-correct.
 # Configuration parameters: .
 # SupportedStyles: use_perl_names, use_english_names
 Style/SpecialGlobalVars:
  EnforcedStyle: use_perl_names

-# Offense count: 545
+# Offense count: 562
 # Cop supports --auto-correct.
 Style/StringConcatenation:
  Enabled: false

-# Offense count: 108
+# Offense count: 109
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
  Enabled: false

-# Offense count: 292
+# Offense count: 293
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method