Add latest changes from gitlab-org/gitlab@master

4 files changed, 0 insertions, 7 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index d8d79d9fa90..7ac7915b325 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -475,7 +475,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/services/ee/merge_requests/refresh_service_spec.rb'
     - 'ee/spec/services/ee/protected_branches/create_service_spec.rb'
     - 'ee/spec/services/epics/update_service_spec.rb'
-    - 'ee/spec/services/geo/file_download_service_spec.rb'
     - 'ee/spec/services/geo/file_registry_removal_service_spec.rb'
     - 'ee/spec/services/geo/repository_verification_primary_service_spec.rb'
     - 'ee/spec/services/groups/recent_merge_requests_count_service_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 345bf1bff92..a9200ee9fba 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -2887,7 +2887,6 @@ Layout/LineLength:
     - 'ee/spec/services/geo/blob_download_service_spec.rb'
     - 'ee/spec/services/geo/blob_upload_service_spec.rb'
     - 'ee/spec/services/geo/container_repository_sync_spec.rb'
-    - 'ee/spec/services/geo/file_download_service_spec.rb'
     - 'ee/spec/services/geo/framework_repository_sync_service_spec.rb'
     - 'ee/spec/services/geo/hashed_storage_attachments_event_store_spec.rb'
     - 'ee/spec/services/geo/hashed_storage_migration_service_spec.rb'
@@ -3131,7 +3130,6 @@ Layout/LineLength:
     - 'ee/spec/workers/geo/batch/project_registry_scheduler_worker_spec.rb'
     - 'ee/spec/workers/geo/container_repository_sync_dispatch_worker_spec.rb'
     - 'ee/spec/workers/geo/destroy_worker_spec.rb'
-    - 'ee/spec/workers/geo/file_download_dispatch_worker_spec.rb'
     - 'ee/spec/workers/geo/project_sync_worker_spec.rb'
     - 'ee/spec/workers/geo/prune_event_log_worker_spec.rb'
     - 'ee/spec/workers/geo/registry_sync_worker_spec.rb'
diff --git a/.rubocop_todo/rspec/any_instance_of.yml b/.rubocop_todo/rspec/any_instance_of.yml
index 00f4a3982e8..32bf03b18ad 100644
--- a/.rubocop_todo/rspec/any_instance_of.yml
+++ b/.rubocop_todo/rspec/any_instance_of.yml
@@ -122,7 +122,6 @@ RSpec/AnyInstanceOf:
   - ee/spec/workers/concerns/elastic/indexing_control_spec.rb
   - ee/spec/workers/elastic_commit_indexer_worker_spec.rb
   - ee/spec/workers/geo/design_repository_shard_sync_worker_spec.rb
-  - ee/spec/workers/geo/file_download_dispatch_worker_spec.rb
   - ee/spec/workers/geo/registry_sync_worker_spec.rb
   - ee/spec/workers/geo/repository_cleanup_worker_spec.rb
   - ee/spec/workers/geo/repository_shard_sync_worker_spec.rb
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 2a4ee9f31f1..26b82a3f473 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -178,7 +178,6 @@ RSpec/VerifiedDoubles:
     - ee/spec/services/ee/service_ping/permit_data_categories_service_spec.rb
     - ee/spec/services/ee/service_ping/service_ping_settings_spec.rb
     - ee/spec/services/geo/blob_download_service_spec.rb
-    - ee/spec/services/geo/file_download_service_spec.rb
     - ee/spec/services/geo/graphql_request_service_spec.rb
     - ee/spec/services/geo/node_status_request_service_spec.rb
     - ee/spec/services/geo/replication_toggle_request_service_spec.rb
@@ -225,8 +224,6 @@ RSpec/VerifiedDoubles:
     - ee/spec/workers/geo/design_repository_sync_worker_spec.rb
     - ee/spec/workers/geo/destroy_worker_spec.rb
     - ee/spec/workers/geo/event_worker_spec.rb
-    - ee/spec/workers/geo/file_download_dispatch_worker_spec.rb
-    - ee/spec/workers/geo/file_download_worker_spec.rb
     - ee/spec/workers/geo/metrics_update_worker_spec.rb
     - ee/spec/workers/geo/prune_event_log_worker_spec.rb
     - ee/spec/workers/geo/registry_sync_worker_spec.rb