Add latest changes from gitlab-org/gitlab@master

5 files changed, 3 insertions, 18 deletions

diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index c38fc19d762..3386eb650f3 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -7019,7 +7019,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/rubocop/cop/safe_params_spec.rb'
     - 'spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb'
     - 'spec/rubocop/cop/scalability/cron_worker_context_spec.rb'
-    - 'spec/rubocop/cop/scalability/file_uploads_spec.rb'
     - 'spec/rubocop/cop/scalability/idempotent_worker_spec.rb'
     - 'spec/rubocop/cop/sidekiq_api_usage_spec.rb'
     - 'spec/rubocop/cop/sidekiq_load_balancing/worker_data_consistency_spec.rb'
diff --git a/.rubocop_todo/style/arguments_forwarding.yml b/.rubocop_todo/style/arguments_forwarding.yml
deleted file mode 100644
index 5a2467f2e98..00000000000
--- a/.rubocop_todo/style/arguments_forwarding.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# Cop supports --autocorrect.
-Style/ArgumentsForwarding:
-  Details: grace period
-  Exclude:
-    - 'ee/app/models/concerns/geo/repository_replicator_strategy.rb'
-    - 'ee/app/serializers/security/vulnerability_report_data_entity.rb'
-    - 'ee/app/services/status_page/publish_base_service.rb'
-    - 'ee/app/workers/ee/project_cache_worker.rb'
-    - 'ee/lib/audit/details.rb'
-    - 'ee/lib/ee/api/geo.rb'
-    - 'ee/lib/ee/gitlab/auth/ldap/adapter.rb'
-    - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
-    - 'ee/spec/features/projects/mirror_spec.rb'
-    - 'ee/spec/lib/gitlab/status_page/storage/s3_multipart_upload_spec.rb'
diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml
index 81b9544f574..f4d1d4e2cc4 100644
--- a/.rubocop_todo/style/empty_method.yml
+++ b/.rubocop_todo/style/empty_method.yml
@@ -106,7 +106,6 @@ Style/EmptyMethod:
     - 'ee/app/controllers/projects/security/sast_configuration_controller.rb'
     - 'ee/app/controllers/projects/settings/slacks_controller.rb'
     - 'ee/app/controllers/registrations/company_controller.rb'
-    - 'ee/app/controllers/registrations/verification_controller.rb'
     - 'ee/app/controllers/subscriptions/groups_controller.rb'
     - 'ee/app/controllers/trials_controller.rb'
     - 'ee/app/controllers/users/identity_verification_controller.rb'
diff --git a/.rubocop_todo/style/mutable_constant.yml b/.rubocop_todo/style/mutable_constant.yml
index 960a8ee6082..2409d4f3521 100644
--- a/.rubocop_todo/style/mutable_constant.yml
+++ b/.rubocop_todo/style/mutable_constant.yml
@@ -52,6 +52,7 @@ Style/MutableConstant:
     - 'rubocop/cop/scalability/idempotent_worker.rb'
     - 'rubocop/cop/sidekiq_load_balancing/worker_data_consistency.rb'
     - 'scripts/lib/glfm/constants.rb'
+    - 'scripts/lint-docs-blueprints.rb'
     - 'scripts/perf/gc/collect_gc_stats.rb'
     - 'spec/support/helpers/jira_integration_helpers.rb'
     - 'tooling/danger/stable_branch.rb'
diff --git a/.rubocop_todo/style/redundant_freeze.yml b/.rubocop_todo/style/redundant_freeze.yml
index ef3ce1cda95..f38a33042e5 100644
--- a/.rubocop_todo/style/redundant_freeze.yml
+++ b/.rubocop_todo/style/redundant_freeze.yml
@@ -227,8 +227,8 @@ Style/RedundantFreeze:
     - 'rubocop/cop/inject_enterprise_edition_module.rb'
     - 'rubocop/cop/project_path_helper.rb'
     - 'rubocop/cop/qa/selector_usage.rb'
+    - 'scripts/lint-docs-blueprints.rb'
     - 'scripts/qa/testcases-check'
-    - 'scripts/review_apps/automated_cleanup.rb'
     - 'scripts/validate_migration_timestamps'
     - 'spec/contracts/provider/helpers/contract_source_helper.rb'
     - 'spec/initializers/secret_token_spec.rb'
@@ -240,4 +240,5 @@ Style/RedundantFreeze:
     - 'tooling/danger/datateam.rb'
     - 'tooling/danger/specs.rb'
     - 'tooling/danger/stable_branch.rb'
+    - 'tooling/lib/tooling/kubernetes_client.rb'
     - 'tooling/lib/tooling/mappings/view_to_js_mappings.rb'