Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -107,24 +107,26 @@ RSpec/MultipleMemoizedHelpers:
 Naming/FileName:
   ExpectMatchingDefinition: true
   Exclude:
-    - 'db/**/*'
-    - 'ee/db/**/*'
-    - 'spec/**/*'
-    - 'features/**/*'
-    - 'ee/spec/**/*'
-    - 'qa/spec/**/*'
-    - 'qa/qa/specs/**/*'
-    - 'qa/bin/*'
+    - '**/*/*.builder'
     - 'ee/bin/*'
+    - 'config.ru'
     - 'config/**/*'
     - 'ee/config/**/*'
+    - 'db/**/*'
+    - 'ee/db/**/*'
+    - 'ee/elastic/migrate/*'
+    - 'lib/tasks/**/*.rake'
+    - 'ee/lib/tasks/**/*.rake'
     - 'lib/generators/**/*'
-    - 'locale/unfound_translations.rb'
-    - 'ee/locale/unfound_translations.rb'
     - 'ee/lib/generators/**/*'
-    - 'qa/qa/scenario/test/integration/ldap_no_tls.rb'
-    - 'qa/qa/scenario/test/integration/ldap_tls.rb'
-    - 'qa/tasks/*'
+    - 'scripts/**/*'
+    - 'spec/**/*'
+    - 'tooling/bin/*'
+    - 'ee/spec/**/*'
+    - 'qa/bin/*'
+    - 'qa/spec/**/*'
+    - 'qa/qa/specs/**/*'
+    - 'qa/tasks/**/*.rake'
 
   IgnoreExecutableScripts: true
   AllowedAcronyms:

.rubocop_manual_todo.yml

@@ -2604,3 +2604,73 @@ Rails/IncludeUrlHelper:
     - 'spec/lib/banzai/filter/issuable_state_filter_spec.rb'
     - 'spec/lib/banzai/filter/reference_redactor_filter_spec.rb'
     - 'spec/lib/banzai/reference_redactor_spec.rb'
+
+# WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/343244
+Naming/FileName:
+  Exclude:
+    - 'app/controllers/concerns/clientside_preview_csp.rb'
+    - 'app/controllers/concerns/one_trust_csp.rb'
+    - 'app/controllers/concerns/static_object_external_storage_csp.rb'
+    - 'app/models/blob_viewer/csv.rb'
+    - 'app/views/issues/_issues_calendar.ics.ruby'
+    - 'ee/app/models/dast/branch.rb'
+    - 'ee/app/models/sca.rb'
+    - 'ee/lib/ee/gitlab/usage_data_counters/hll_redis_counter.rb'
+    - 'ee/lib/elastic/v12p1/application_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/application_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/config.rb'
+    - 'ee/lib/elastic/v12p1/issue_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/issue_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/merge_request_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/merge_request_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/milestone_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/milestone_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/note_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/note_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/project_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/project_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/project_wiki_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/project_wiki_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/repository_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/repository_instance_proxy.rb'
+    - 'ee/lib/elastic/v12p1/routing.rb'
+    - 'ee/lib/elastic/v12p1/snippet_class_proxy.rb'
+    - 'ee/lib/elastic/v12p1/snippet_instance_proxy.rb'
+    - 'ee/lib/gitlab/auth/smartcard/san_extension.rb'
+    - 'ee/lib/gitlab/cidr.rb'
+    - 'ee/lib/gitlab/elastic/bool_expr.rb'
+    - 'ee/lib/gitlab/spdx/catalogue.rb'
+    - 'ee/lib/gitlab/spdx/catalogue_gateway.rb'
+    - 'ee/lib/gitlab/spdx/license.rb'
+    - 'ee/lib/gitlab/status_page/storage/object.rb'
+    - 'haml_lint/inline_javascript.rb'
+    - 'lib/api/entities/mr_note.rb'
+    - 'lib/api/helpers/sse_helpers.rb'
+    - 'lib/gitlab/ci/pipeline/chain/command.rb'
+    - 'lib/gitlab/database/migrations/observation.rb'
+    - 'lib/gitlab/health_checks/metric.rb'
+    - 'lib/gitlab/health_checks/probes/status.rb'
+    - 'lib/gitlab/health_checks/result.rb'
+    - 'lib/gitlab/jwt_token.rb'
+    - 'lib/gitlab/middleware/release_env.rb'
+    - 'lib/gitlab/redis/hll.rb'
+    - 'lib/gitlab/slash_commands/result.rb'
+    - 'lib/gitlab/template_parser/ast.rb'
+    - 'lib/gitlab/usage/metrics/instrumentations/redis_hll_metric.rb'
+    - 'lib/gitlab/usage_data_counters/hll_redis_counter.rb'
+    - 'lib/gitlab/usage_data_counters/vs_code_extension_activity_unique_counter.rb'
+    - 'qa/qa/fixtures/auto_devops_rack/config.ru'
+    - 'qa/qa/resource/user_gpg.rb'
+    - 'qa/qa/runtime/gpg.rb'
+    - 'qa/qa/runtime/key/ecdsa.rb'
+    - 'qa/qa/runtime/key/ed25519.rb'
+    - 'qa/qa/support/otp.rb'
+    - 'qa/qa/tools/initialize_gitlab_auth.rb'
+    - 'rubocop/cop/gitlab/change_timzone.rb'
+    - 'rubocop/cop/gitlab/keys-first-and-values-first.rb'
+    - 'rubocop/cop/graphql/gid_expected_type.rb'
+    - 'rubocop/cop/performance/ar_count_each.rb'
+    - 'rubocop/cop/performance/ar_exists_and_present_blank.rb'
+    - 'rubocop/rubocop.rb'
+    - 'tooling/lib/tooling/images.rb'
+    - 'tooling/lib/tooling/parallel_rspec_runner.rb'

.rubocop_todo.yml

@@ -208,12 +208,6 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 25
 
-# 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:
-  Enabled: false
-
 # Offense count: 11
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: lowercase, uppercase