Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 6 deletions

diff --git a/.rubocop_todo/rails/file_path.yml b/.rubocop_todo/rails/file_path.yml
index 467073eb2db..24a08fa5ee2 100644
--- a/.rubocop_todo/rails/file_path.yml
+++ b/.rubocop_todo/rails/file_path.yml
@@ -1,10 +1,7 @@
 ---
 Rails/FilePath:
-  # Offense count: 212
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
-    - 'app/controllers/clusters/clusters_controller.rb'
     - 'app/controllers/help_controller.rb'
     - 'app/helpers/startupjs_helper.rb'
     - 'app/models/clusters/applications/cert_manager.rb'
@@ -29,6 +26,7 @@ Rails/FilePath:
     - 'ee/db/fixtures/development/21_dast_profiles.rb'
     - 'ee/db/fixtures/development/32_compliance_report_violations.rb'
     - 'ee/lib/ee/feature/definition.rb'
+    - 'ee/lib/ee/gitlab/audit/type/definition.rb'
     - 'ee/lib/ee/gitlab/usage/metric_definition.rb'
     - 'ee/lib/gitlab/geo/health_check.rb'
     - 'ee/lib/tasks/gitlab/seed/metrics.rake'
@@ -48,6 +46,8 @@ Rails/FilePath:
     - 'lib/api/api.rb'
     - 'lib/error_tracking/collector/payload_validator.rb'
     - 'lib/feature/definition.rb'
+    - 'lib/gitlab/audit/type/definition.rb'
+    - 'lib/gitlab/ci/parsers/sbom/validators/cyclonedx_schema_validator.rb'
     - 'lib/gitlab/ci/reports/codequality_reports.rb'
     - 'lib/gitlab/database/migrations/runner.rb'
     - 'lib/gitlab/favicon.rb'
@@ -69,14 +69,17 @@ Rails/FilePath:
     - 'lib/system_check/app/systemd_unit_files_or_init_script_up_to_date_check.rb'
     - 'lib/system_check/app/uploads_directory_exists_check.rb'
     - 'lib/system_check/incoming_email/imap_authentication_check.rb'
+    - 'lib/tasks/gitlab/db.rake'
     - 'lib/tasks/gitlab/metrics_exporter.rake'
+    - 'lib/tasks/gitlab/usage_data.rake'
     - 'lib/tasks/tanuki_emoji.rake'
     - 'metrics_server/metrics_server.rb'
     - 'spec/commands/metrics_server/metrics_server_spec.rb'
     - 'spec/config/object_store_settings_spec.rb'
-    - 'spec/controllers/help_controller_spec.rb'
+    - 'spec/db/development/add_security_training_providers_spec.rb'
     - 'spec/db/development/create_base_work_item_types_spec.rb'
     - 'spec/db/development/import_common_metrics_spec.rb'
+    - 'spec/db/production/add_security_training_providers_spec.rb'
     - 'spec/db/production/create_base_work_item_types_spec.rb'
     - 'spec/db/production/import_common_metrics_spec.rb'
     - 'spec/db/schema_spec.rb'
@@ -100,7 +103,6 @@ Rails/FilePath:
     - 'spec/features/projects/settings/repository_settings_spec.rb'
     - 'spec/features/projects/settings/user_changes_avatar_spec.rb'
     - 'spec/features/projects/snippets/create_snippet_spec.rb'
-    - 'spec/features/projects/tags/user_edits_tags_spec.rb'
     - 'spec/features/projects/tree/upload_file_spec.rb'
     - 'spec/features/snippets/user_creates_snippet_spec.rb'
     - 'spec/features/snippets/user_edits_snippet_spec.rb'
@@ -127,10 +129,12 @@ Rails/FilePath:
     - 'spec/models/clusters/applications/cert_manager_spec.rb'
     - 'spec/models/release_highlight_spec.rb'
     - 'spec/requests/api/internal/mail_room_spec.rb'
+    - 'spec/requests/api/usage_data_queries_spec.rb'
     - 'spec/serializers/review_app_setup_entity_spec.rb'
     - 'spec/services/clusters/aws/fetch_credentials_service_spec.rb'
     - 'spec/services/clusters/aws/provision_service_spec.rb'
     - 'spec/services/metrics/sample_metrics_service_spec.rb'
+    - 'spec/support/helpers/doc_url_helper.rb'
     - 'spec/support/helpers/test_env.rb'
     - 'spec/support/helpers/upload_helpers.rb'
     - 'spec/support/shared_examples/features/project_upload_files_shared_examples.rb'
@@ -139,3 +143,4 @@ Rails/FilePath:
     - 'spec/support/shared_examples/models/wiki_shared_examples.rb'
     - 'spec/tasks/gitlab/db_rake_spec.rb'
     - 'spec/tasks/gitlab/generate_sample_prometheus_data_spec.rb'
+    - 'spec/tasks/gitlab/usage_data_rake_spec.rb'