Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 262 insertions, 134 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 293c8fccf33..d60ab9b2fcc 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,49 +1,77 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-10-29 17:35:37 UTC using RuboCop version 0.89.1.
+# on 2021-01-11 15:49:32 UTC using RuboCop version 0.91.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: 310
+# Offense count: 313
 # Cop supports --auto-correct.
 Capybara/CurrentPathExpectation:
   Enabled: false
 
-# Offense count: 210
+# Offense count: 218
 Capybara/VisibilityMatcher:
   Enabled: false
 
-# Offense count: 1903
+# Offense count: 1
+Gitlab/PolicyRuleBoolean:
+  Exclude:
+    - 'ee/app/policies/ee/identity_provider_policy.rb'
+
+# Offense count: 5
+Graphql/IDType:
+  Exclude:
+    - 'app/graphql/mutations/boards/issues/issue_move_list.rb'
+
+# Offense count: 2054
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
 Layout/ArgumentAlignment:
   Enabled: false
 
-# Offense count: 49
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: start_of_line, begin
+Layout/BeginEndAlignment:
+  Exclude:
+    - 'app/controllers/groups/shared_projects_controller.rb'
+    - 'app/workers/concerns/reactive_cacheable_worker.rb'
+    - 'ee/app/services/security/token_revocation_service.rb'
+    - 'ee/lib/gitlab/analytics/cycle_analytics/summary/group/deploy.rb'
+    - 'ee/lib/gitlab/ci/config/entry/vault/secret.rb'
+    - 'lib/api/internal/base.rb'
+    - 'lib/atlassian/jira_connect/serializers/build_entity.rb'
+    - 'lib/gitlab/ci/jwt.rb'
+    - 'lib/gitlab/external_authorization/client.rb'
+    - 'lib/gitlab/phabricator_import/project_creator.rb'
+    - 'scripts/gitaly_test.rb'
+
+# Offense count: 52
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAliasSyntax, AllowedMethods.
 # AllowedMethods: alias_method, public, protected, private
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: false
 
-# Offense count: 610
+# Offense count: 721
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Layout/FirstArrayElementIndentation:
   Enabled: false
 
-# Offense count: 1535
+# Offense count: 1592
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
   Enabled: false
 
-# Offense count: 2754
+# Offense count: 3019
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -52,33 +80,47 @@ Layout/FirstHashElementIndentation:
 Layout/HashAlignment:
   Enabled: false
 
-# Offense count: 64
+# Offense count: 73
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 1313
 
-# Offense count: 118
+# Offense count: 163
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
 Layout/MultilineOperationIndentation:
   Enabled: false
 
-# Offense count: 52
+# Offense count: 11
+# Cop supports --auto-correct.
+Layout/RescueEnsureAlignment:
+  Exclude:
+    - 'app/models/blob_viewer/dependency_manager.rb'
+    - 'app/models/project.rb'
+    - 'app/services/prometheus/proxy_service.rb'
+    - 'app/workers/concerns/reactive_cacheable_worker.rb'
+    - 'app/workers/delete_stored_files_worker.rb'
+    - 'config/initializers/1_settings.rb'
+    - 'config/initializers/trusted_proxies.rb'
+    - 'lib/api/internal/base.rb'
+    - 'lib/gitlab/highlight.rb'
+
+# Offense count: 53
 # Cop supports --auto-correct.
 Layout/SpaceAroundMethodCallOperator:
   Enabled: false
 
-# Offense count: 790
+# Offense count: 725
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_no_space, require_space
 Layout/SpaceInLambdaLiteral:
   Enabled: false
 
-# Offense count: 1110
+# Offense count: 218
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -86,7 +128,7 @@ Layout/SpaceInLambdaLiteral:
 Layout/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 501
+# Offense count: 559
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
@@ -96,7 +138,6 @@ Layout/SpaceInsideParens:
 # Offense count: 18
 Lint/BinaryOperatorWithIdenticalOperands:
   Exclude:
-    - 'app/finders/concerns/time_frame_filter.rb'
     - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
     - 'spec/helpers/visibility_level_helper_spec.rb'
     - 'spec/lib/gitlab/conan_token_spec.rb'
@@ -110,6 +151,10 @@ Lint/BinaryOperatorWithIdenticalOperands:
     - 'spec/models/repository_spec.rb'
     - 'spec/models/ssh_host_key_spec.rb'
 
+# Offense count: 83
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
 # Offense count: 9
 # Cop supports --auto-correct.
 Lint/DeprecatedOpenSSLConstant:
@@ -118,7 +163,6 @@ Lint/DeprecatedOpenSSLConstant:
     - 'ee/lib/gitlab/geo/oauth/logout_state.rb'
     - 'lib/gitlab/conan_token.rb'
     - 'lib/gitlab/gitaly_client.rb'
-    - 'lib/gitlab/kubernetes/helm/certificate.rb'
     - 'lib/gitlab/kubernetes/helm/v2/certificate.rb'
     - 'spec/lib/gitlab/conan_token_spec.rb'
     - 'spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb'
@@ -126,11 +170,25 @@ Lint/DeprecatedOpenSSLConstant:
     - 'spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb'
 
 # Offense count: 1
-Lint/FloatComparison:
+Lint/DuplicateRequire:
+  Exclude:
+    - 'ee/spec/lib/gitlab/auth/group_saml/user_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowComments.
+Lint/EmptyFile:
   Exclude:
-    - 'ee/app/models/ee/namespace.rb'
+    - 'db/seeds.rb'
+    - 'ee/db/geo/seeds.rb'
 
-# Offense count: 157
+# Offense count: 8
+# Cop supports --auto-correct.
+Lint/IdentityComparison:
+  Exclude:
+    - 'spec/lib/gitlab/danger/weightage/maintainers_spec.rb'
+    - 'spec/lib/gitlab/danger/weightage/reviewers_spec.rb'
+
+# Offense count: 184
 # Configuration parameters: MaximumRangeSize.
 Lint/MissingCopEnableDirective:
   Enabled: false
@@ -153,13 +211,7 @@ Lint/MixedRegexpCaptureTypes:
     - 'lib/gitlab/slash_commands/issue_new.rb'
     - 'lib/gitlab/slash_commands/run.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/NonDeterministicRequireOrder:
-  Exclude:
-    - 'rubocop/rubocop.rb'
-
-# Offense count: 118
+# Offense count: 141
 # Cop supports --auto-correct.
 Lint/RedundantCopDisableDirective:
   Enabled: false
@@ -169,12 +221,6 @@ Lint/SelfAssignment:
   Exclude:
     - 'spec/lib/gitlab/search_context/builder_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/SendWithMixinArgument:
-  Exclude:
-    - 'config/initializers/trusted_proxies.rb'
-
 # Offense count: 3
 Lint/StructNewOverride:
   Exclude:
@@ -187,20 +233,63 @@ Lint/UnreachableLoop:
   Exclude:
     - 'qa/qa/runtime/feature.rb'
 
-# Offense count: 5
-# Configuration parameters: IgnoredMethods.
+# Offense count: 22
+# Cop supports --auto-correct.
+# Configuration parameters: AllowComments.
+Lint/UselessMethodDefinition:
+  Enabled: false
+
+# Offense count: 7
+# Configuration parameters: IgnoredMethods, Max.
 Metrics/AbcSize:
-  Max: 59
+  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'
 
-# Offense count: 13
-# Configuration parameters: IgnoredMethods.
+# Offense count: 15
+# Configuration parameters: IgnoredMethods, Max.
 Metrics/CyclomaticComplexity:
-  Max: 25
+  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'
+    - 'lib/gitlab/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'
 
-# Offense count: 13
-# Configuration parameters: IgnoredMethods.
+# Offense count: 15
+# Configuration parameters: IgnoredMethods, Max.
 Metrics/PerceivedComplexity:
-  Max: 25
+  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'
+    - 'lib/gitlab/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'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -208,7 +297,7 @@ Migration/DepartmentName:
   Exclude:
     - 'app/models/commit.rb'
 
-# Offense count: 171
+# Offense count: 184
 # 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:
@@ -225,7 +314,7 @@ Naming/HeredocDelimiterCase:
     - 'spec/support/helpers/repo_helpers.rb'
     - 'spec/support/helpers/seed_repo.rb'
 
-# Offense count: 263
+# Offense count: 308
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -239,7 +328,7 @@ Naming/MethodParameterName:
     - 'lib/gitlab/diff/inline_diff.rb'
     - 'spec/support/helpers/key_generator_helper.rb'
 
-# Offense count: 191
+# Offense count: 206
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredName.
 Naming/RescuedExceptionsVariableName:
@@ -251,12 +340,22 @@ Performance/AncestorsInclude:
   Exclude:
     - 'lib/gitlab/ci/config/extendable/entry.rb'
 
+# Offense count: 39
+# Cop supports --auto-correct.
+Performance/BlockGivenWithExplicitBlock:
+  Enabled: false
+
 # Offense count: 28
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
   Enabled: false
 
-# Offense count: 19
+# Offense count: 37
+# Cop supports --auto-correct.
+Performance/ConstantRegexp:
+  Enabled: false
+
+# Offense count: 18
 # Cop supports --auto-correct.
 Performance/Count:
   Exclude:
@@ -267,10 +366,9 @@ Performance/Count:
     - 'spec/lib/gitlab/conflict/file_spec.rb'
     - 'spec/lib/gitlab/git/tree_spec.rb'
     - 'spec/models/ci/build_spec.rb'
-    - 'spec/support/matchers/exceed_query_limit.rb'
     - 'spec/support_specs/helpers/active_record/query_recorder_spec.rb'
 
-# Offense count: 15
+# Offense count: 14
 # Cop supports --auto-correct.
 # Configuration parameters: SafeMultiline.
 Performance/DeletePrefix:
@@ -283,14 +381,13 @@ Performance/DeletePrefix:
     - 'lib/gitlab/gfm/uploads_rewriter.rb'
     - 'lib/gitlab/git/ref.rb'
     - 'lib/gitlab/project_template.rb'
-    - 'lib/gitlab/repo_path.rb'
     - 'lib/gitlab/setup_helper.rb'
     - 'lib/gitlab/time_tracking_formatter.rb'
     - 'spec/controllers/projects/artifacts_controller_spec.rb'
     - 'spec/lib/gitlab/gfm/uploads_rewriter_spec.rb'
     - 'spec/support/helpers/test_env.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: SafeMultiline.
 Performance/DeleteSuffix:
@@ -299,7 +396,6 @@ Performance/DeleteSuffix:
     - 'app/workers/concerns/application_worker.rb'
     - 'ee/app/models/geo/upload_registry.rb'
     - 'ee/app/workers/geo/file_download_dispatch_worker/attachment_job_finder.rb'
-    - 'lib/gitlab/repo_path.rb'
     - 'lib/sentry/client/issue.rb'
 
 # Offense count: 13
@@ -313,7 +409,11 @@ Performance/Detect:
     - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
     - 'spec/models/event_spec.rb'
 
-# Offense count: 19
+# Offense count: 116
+Performance/MethodObjectAsBlock:
+  Enabled: false
+
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect.
 Performance/StringInclude:
@@ -330,23 +430,30 @@ Performance/StringInclude:
     - 'qa/qa/ee/page/merge_request/show.rb'
     - 'qa/qa/specs/runner.rb'
     - 'spec/features/projects/jobs_spec.rb'
-    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support_specs/helpers/active_record/query_recorder_spec.rb'
 
-# Offense count: 9
+# Offense count: 18
 # Cop supports --auto-correct.
 Performance/Sum:
   Exclude:
+    - 'app/controllers/projects/pipelines/tests_controller.rb'
     - 'app/models/application_setting_implementation.rb'
     - 'app/models/ci/pipeline.rb'
+    - 'app/services/issues/export_csv_service.rb'
     - 'ee/spec/lib/gitlab/elastic/bulk_indexer_spec.rb'
+    - 'lib/api/entities/issuable_time_stats.rb'
+    - 'lib/container_registry/tag.rb'
     - 'lib/declarative_policy/rule.rb'
     - 'lib/declarative_policy/runner.rb'
+    - 'lib/gitlab/ci/reports/test_suite_comparer.rb'
+    - 'lib/gitlab/diff/file.rb'
     - 'lib/gitlab/sherlock/transaction.rb'
     - 'lib/gitlab/usage_data.rb'
+    - 'lib/peek/views/detailed_view.rb'
+    - 'spec/models/namespace/root_storage_statistics_spec.rb'
 
-# Offense count: 13879
+# Offense count: 14717
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -359,65 +466,50 @@ RSpec/EmptyExampleGroup:
     - 'ee/spec/services/personal_access_tokens/revoke_invalid_tokens_spec.rb'
     - 'spec/services/projects/prometheus/alerts/notify_service_spec.rb'
 
-# Offense count: 1310
+# Offense count: 1365
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: method_call, block
 RSpec/ExpectChange:
   Enabled: false
 
-RSpec/ExpectGitlabTracking:
-  Exclude:
-    - 'ee/spec/requests/api/visual_review_discussions_spec.rb'
-    - 'ee/spec/services/epics/issue_promote_service_spec.rb'
-    - 'spec/controllers/groups/registry/repositories_controller_spec.rb'
-    - 'spec/controllers/projects/registry/repositories_controller_spec.rb'
-    - 'spec/controllers/projects/registry/tags_controller_spec.rb'
-    - 'spec/controllers/projects/settings/operations_controller_spec.rb'
-    - 'spec/lib/api/helpers_spec.rb'
-    - 'spec/requests/api/project_container_repositories_spec.rb'
-    - 'spec/support/shared_examples/controllers/trackable_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/discussions_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/packages_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/tracking_shared_examples.rb'
-
-# Offense count: 888
+# Offense count: 889
 RSpec/ExpectInHook:
   Enabled: false
 
-# Offense count: 15945
+# Offense count: 16403
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 40
 
-# Offense count: 2297
+# Offense count: 2352
 # Cop supports --auto-correct.
 # Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
 # SupportedStyles: inflected, explicit
 RSpec/PredicateMatcher:
   Enabled: false
 
-# Offense count: 98
+# Offense count: 112
 RSpec/RepeatedExampleGroupBody:
   Enabled: false
 
-# Offense count: 213
+# Offense count: 219
 RSpec/RepeatedExampleGroupDescription:
   Enabled: false
 
-# Offense count: 636
+# Offense count: 655
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: and_return, block
 RSpec/ReturnFromStub:
   Enabled: false
 
-# Offense count: 574
+# Offense count: 596
 # Cop supports --auto-correct.
 RSpec/ScatteredLet:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 6
 RSpec/ScatteredSetup:
   Exclude:
     - 'spec/requests/api/jobs_spec.rb'
@@ -429,7 +521,7 @@ RSpec/VariableDefinition:
   Exclude:
     - 'spec/initializers/mail_encoding_patch_spec.rb'
 
-# Offense count: 25
+# Offense count: 24
 # Configuration parameters: EnforcedStyle, IgnoredPatterns.
 # SupportedStyles: snake_case, camelCase
 RSpec/VariableName:
@@ -437,13 +529,12 @@ RSpec/VariableName:
     - 'spec/features/projects/import_export/import_file_spec.rb'
     - 'spec/features/task_lists_spec.rb'
     - 'spec/initializers/mail_encoding_patch_spec.rb'
-    - 'spec/lib/gitlab/experimentation_spec.rb'
     - 'spec/models/board_spec.rb'
     - 'spec/support/shared_contexts/url_shared_context.rb'
     - '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: 27
+# Offense count: 25
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -472,25 +563,25 @@ Rails/BelongsTo:
     - 'app/models/deployment.rb'
     - 'app/models/environment.rb'
 
-# Offense count: 84
+# Offense count: 90
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Include: db/migrate/*.rb
 Rails/BulkChangeTable:
   Enabled: false
 
-# Offense count: 151
+# Offense count: 153
 # Cop supports --auto-correct.
 Rails/ContentTag:
   Enabled: false
 
-# Offense count: 270
+# Offense count: 300
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
-# Offense count: 323
+# Offense count: 347
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
@@ -512,13 +603,13 @@ Rails/FindById:
     - 'spec/finders/concerns/finder_methods_spec.rb'
     - 'spec/finders/concerns/finder_with_cross_project_access_spec.rb'
 
-# Offense count: 329
+# Offense count: 346
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Enabled: false
 
-# Offense count: 507
+# Offense count: 539
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -542,7 +633,7 @@ Rails/IndexBy:
     - 'lib/gitlab/database/count/reltuples_count_strategy.rb'
     - 'lib/gitlab/language_detection.rb'
 
-# Offense count: 44
+# Offense count: 45
 # Cop supports --auto-correct.
 Rails/IndexWith:
   Enabled: false
@@ -552,7 +643,7 @@ Rails/Inquiry:
   Exclude:
     - 'spec/helpers/labels_helper_spec.rb'
 
-# Offense count: 112
+# Offense count: 115
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/InverseOf:
@@ -580,33 +671,34 @@ Rails/MailerName:
   Exclude:
     - 'app/mailers/notify.rb'
 
-# Offense count: 48
+# Offense count: 51
 # Cop supports --auto-correct.
 Rails/NegateInclude:
   Enabled: false
 
-# Offense count: 41
+# Offense count: 44
 # Cop supports --auto-correct.
 Rails/Pick:
   Enabled: false
 
-# Offense count: 113
+# Offense count: 110
 # Cop supports --auto-correct.
 Rails/Pluck:
   Enabled: false
 
-# Offense count: 38
+# Offense count: 39
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: **/Rakefile, **/*.rake
 Rails/RakeEnvironment:
   Enabled: false
 
-# Offense count: 52
+# Offense count: 58
 # Cop supports --auto-correct.
 Rails/RedundantForeignKey:
   Enabled: false
 
+# Offense count: 1
 Rails/RenderInline:
   Exclude:
     - 'ee/app/controllers/sitemap_controller.rb'
@@ -621,18 +713,23 @@ Rails/ShortI18n:
     - 'app/uploaders/content_type_whitelist.rb'
     - 'spec/views/shared/runners/show.html.haml_spec.rb'
 
-# Offense count: 1043
+# Offense count: 1080
 # 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: 202
+# Offense count: 251
 # Cop supports --auto-correct.
 Rails/SquishedSQLHeredocs:
   Enabled: false
 
-# Offense count: 37
+# Offense count: 45
+# Cop supports --auto-correct.
+Rails/WhereEquals:
+  Enabled: false
+
+# Offense count: 40
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: exists, where
@@ -661,13 +758,12 @@ Security/YAMLLoad:
 Style/AccessorGrouping:
   Enabled: false
 
-# Offense count: 13
+# Offense count: 12
 # Cop supports --auto-correct.
 Style/ArrayCoercion:
   Exclude:
     - 'app/controllers/admin/ci/variables_controller.rb'
     - 'app/controllers/groups/variables_controller.rb'
-    - 'app/controllers/import/bulk_imports_controller.rb'
     - 'app/controllers/projects/variables_controller.rb'
     - 'db/migrate/20190620105427_change_null_private_profile_to_false.rb'
     - 'db/post_migrate/20190812070645_migrate_private_profile_nulls.rb'
@@ -679,7 +775,7 @@ Style/ArrayCoercion:
     - 'ee/lib/ee/banzai/pipeline/gfm_pipeline.rb'
     - 'spec/support/helpers/lfs_http_helpers.rb'
 
-# Offense count: 176
+# Offense count: 183
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: percent_q, bare_percent
@@ -693,11 +789,27 @@ Style/BisectedAttrAccessor:
     - 'lib/system_check/base_check.rb'
     - 'qa/qa/resource/api_fabricator.rb'
 
-# Offense count: 37
+# Offense count: 36
 # Cop supports --auto-correct.
 Style/CaseLikeIf:
   Enabled: false
 
+# Offense count: 15
+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'
+    - 'spec/migrations/cleanup_optimistic_locking_nulls_spec.rb'
+    - 'spec/requests/api/members_spec.rb'
+    - 'spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
@@ -723,7 +835,7 @@ Style/EachWithObject:
 Style/EmptyElse:
   Enabled: false
 
-# Offense count: 193
+# Offense count: 197
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
@@ -737,94 +849,99 @@ Style/ExpandPathArguments:
     - 'cable/config.ru'
     - 'config.ru'
 
-# Offense count: 118
+# Offense count: 116
 # Cop supports --auto-correct.
 Style/ExplicitBlockArgument:
   Enabled: false
 
-# Offense count: 521
+# Offense count: 555
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
   Enabled: false
 
-# Offense count: 48
+# Offense count: 61
 # Cop supports --auto-correct.
 Style/GlobalStdStream:
   Enabled: false
 
-# Offense count: 835
+# Offense count: 879
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 93
+# Offense count: 56
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: braces, no_braces
 Style/HashAsLastArrayItem:
   Enabled: false
 
-# Offense count: 55
+# Offense count: 66
 # Cop supports --auto-correct.
 Style/HashEachMethods:
   Enabled: false
 
-# Offense count: 30
+# Offense count: 33
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
   Enabled: false
 
-# Offense count: 1798
+# Offense count: 1888
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 447
+# Offense count: 68
+# Cop supports --auto-correct.
+Style/KeywordParametersOrder:
+  Enabled: false
+
+# Offense count: 431
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: line_count_dependent, lambda, literal
 Style/Lambda:
   Enabled: false
 
-# Offense count: 18
+# Offense count: 20
 Style/MissingRespondToMissing:
   Enabled: false
 
-# Offense count: 32
+# Offense count: 35
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength.
 # SupportedStyles: skip_modifier_ifs, always
 Style/Next:
   Enabled: false
 
-# Offense count: 95
+# Offense count: 98
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
   Enabled: false
 
-# Offense count: 132
+# Offense count: 135
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
   Enabled: false
 
-# Offense count: 2473
+# Offense count: 2601
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Enabled: false
 
-# Offense count: 246
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false
 
-# Offense count: 66
+# Offense count: 65
 # Cop supports --auto-correct.
 Style/RedundantAssignment:
   Enabled: false
@@ -846,91 +963,102 @@ Style/RedundantFetchBlock:
 Style/RedundantFileExtensionInRequire:
   Enabled: false
 
-# Offense count: 260
+# Offense count: 220
 # Cop supports --auto-correct.
 Style/RedundantFreeze:
   Enabled: false
 
-# Offense count: 167
+# Offense count: 182
 # Cop supports --auto-correct.
 Style/RedundantInterpolation:
   Enabled: false
 
-# Offense count: 11
+# Offense count: 8
 # Cop supports --auto-correct.
 Style/RedundantRegexpCharacterClass:
   Exclude:
     - 'app/models/concerns/taskable.rb'
-    - 'ee/lib/ee/gitlab/path_regex.rb'
     - 'lib/gitlab/authorized_keys.rb'
     - 'lib/gitlab/fogbugz_import/repository.rb'
-    - 'lib/gitlab/prometheus/internal.rb'
     - 'lib/gitlab/quick_actions/substitution_definition.rb'
     - 'lib/gitlab/regex.rb'
     - 'spec/features/merge_request/user_views_open_merge_request_spec.rb'
     - 'spec/tasks/gitlab/usage_data_rake_spec.rb'
 
-# Offense count: 250
+# Offense count: 270
 # Cop supports --auto-correct.
 Style/RedundantRegexpEscape:
   Enabled: false
 
-# Offense count: 868
+# Offense count: 920
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Enabled: false
 
-# Offense count: 179
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantSelfAssignment:
+  Exclude:
+    - 'app/models/concerns/issuable.rb'
+    - 'spec/db/schema_spec.rb'
+
+# Offense count: 196
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Enabled: false
 
-# Offense count: 49
+# Offense count: 50
 # Cop supports --auto-correct.
 Style/RescueModifier:
   Enabled: false
 
-# Offense count: 329
+# Offense count: 346
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
   Enabled: false
 
-# Offense count: 104
+# Offense count: 115
 # Cop supports --auto-correct.
 Style/SingleArgumentDig:
   Enabled: false
 
-# Offense count: 47
+# Offense count: 45
 # Cop supports --auto-correct.
 Style/SlicingWithRange:
   Enabled: false
 
-# Offense count: 109
+# Offense count: 61
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
+  Enabled: false
+
+# Offense count: 121
 # Cop supports --auto-correct.
 # Configuration parameters: .
 # SupportedStyles: use_perl_names, use_english_names
 Style/SpecialGlobalVars:
   EnforcedStyle: use_perl_names
 
-# Offense count: 516
+# Offense count: 545
 # Cop supports --auto-correct.
 Style/StringConcatenation:
   Enabled: false
 
-# Offense count: 103
+# Offense count: 108
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-# Offense count: 276
+# Offense count: 292
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Enabled: false
+