Add latest changes from gitlab-org/gitlab@master

10 files changed, 0 insertions, 47 deletions

diff --git a/.rubocop_todo/cop/ignored_columns.yml b/.rubocop_todo/cop/ignored_columns.yml
index a791fcd0d6d..d15bcb497d9 100644
--- a/.rubocop_todo/cop/ignored_columns.yml
+++ b/.rubocop_todo/cop/ignored_columns.yml
@@ -1,7 +1,6 @@
 ---
 Cop/IgnoredColumns:
   Exclude:
-    - 'app/models/loose_foreign_keys/deleted_record.rb'
     - 'ee/lib/ee/gitlab/background_migration/create_vulnerability_links.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_vulnerabilities_feedback_to_vulnerabilities_state_transition.rb'
     - 'spec/lib/gitlab/database/partitioning/sliding_list_strategy_spec.rb'
diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
index 19f31b94a6a..f1f86122067 100644
--- a/.rubocop_todo/gitlab/namespaced_class.yml
+++ b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -1028,7 +1028,6 @@ Gitlab/NamespacedClass:
     - 'ee/app/workers/elastic_namespace_rollout_worker.rb'
     - 'ee/app/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker.rb'
     - 'ee/app/workers/elastic_wiki_indexer_worker.rb'
-    - 'ee/app/workers/geo_repository_destroy_worker.rb'
     - 'ee/app/workers/group_saml_group_sync_worker.rb'
     - 'ee/app/workers/historical_data_worker.rb'
     - 'ee/app/workers/import_software_licenses_worker.rb'
diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml
index c40f51cf04e..a1aacb908e6 100644
--- a/.rubocop_todo/gitlab/strong_memoize_attr.yml
+++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml
@@ -375,7 +375,6 @@ Gitlab/StrongMemoizeAttr:
     - 'ee/app/services/vulnerability_feedback/create_service.rb'
     - 'ee/app/services/vulnerability_feedback/destroy_service.rb'
     - 'ee/app/workers/auth/saml_group_sync_worker.rb'
-    - 'ee/app/workers/geo/repository_cleanup_worker.rb'
     - 'ee/app/workers/geo/scheduler/scheduler_worker.rb'
     - 'ee/app/workers/status_page/publish_worker.rb'
     - 'ee/lib/api/analytics/project_deployment_frequency.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index a68124c649b..471aed8912f 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1083,16 +1083,10 @@ Layout/LineLength:
     - 'ee/app/workers/elastic_commit_indexer_worker.rb'
     - 'ee/app/workers/elastic_delete_project_worker.rb'
     - 'ee/app/workers/elastic_namespace_rollout_worker.rb'
-    - 'ee/app/workers/geo/batch/project_registry_scheduler_worker.rb'
-    - 'ee/app/workers/geo/batch/project_registry_worker.rb'
     - 'ee/app/workers/geo/destroy_worker.rb'
-    - 'ee/app/workers/geo/repositories_clean_up_worker.rb'
-    - 'ee/app/workers/geo/repository_shard_sync_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/secondary/shard_worker.rb'
     - 'ee/app/workers/geo/scheduler/scheduler_worker.rb'
     - 'ee/app/workers/geo/secondary/registry_consistency_worker.rb'
     - 'ee/app/workers/geo/verification_worker.rb'
-    - 'ee/app/workers/geo_repository_destroy_worker.rb'
     - 'ee/app/workers/repository_update_mirror_worker.rb'
     - 'ee/app/workers/security/orchestration_policy_rule_schedule_namespace_worker.rb'
     - 'ee/app/workers/security/orchestration_policy_rule_schedule_worker.rb'
diff --git a/.rubocop_todo/lint/redundant_cop_disable_directive.yml b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
index 453954e9bd1..1f452c24c15 100644
--- a/.rubocop_todo/lint/redundant_cop_disable_directive.yml
+++ b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
@@ -114,8 +114,6 @@ Lint/RedundantCopDisableDirective:
     - 'ee/app/services/ee/search_service.rb'
     - 'ee/app/services/security/token_revocation_service.rb'
     - 'ee/app/workers/ee/issuable_export_csv_worker.rb'
-    - 'ee/app/workers/geo/repository_shard_sync_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/secondary/shard_worker.rb'
     - 'ee/app/workers/scan_security_report_secrets_worker.rb'
     - 'ee/app/workers/security/orchestration_policy_rule_schedule_worker.rb'
     - 'ee/db/geo/migrate/20210504143244_add_verification_to_merge_request_diff_registry.rb'
diff --git a/.rubocop_todo/rails/pluck.yml b/.rubocop_todo/rails/pluck.yml
index 6ed8c935f82..7a25f45bfc4 100644
--- a/.rubocop_todo/rails/pluck.yml
+++ b/.rubocop_todo/rails/pluck.yml
@@ -21,8 +21,6 @@ Rails/Pluck:
     - 'ee/app/models/boards/epic_list.rb'
     - 'ee/app/models/concerns/geo/verification_state.rb'
     - 'ee/app/services/concerns/incident_management/oncall_rotations/shared_rotation_logic.rb'
-    - 'ee/app/workers/geo/repository_shard_sync_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/secondary/shard_worker.rb'
     - 'ee/app/workers/geo/scheduler/scheduler_worker.rb'
     - 'ee/lib/banzai/filter/references/iteration_reference_filter.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/person.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index 20f9cd77113..c956d05f6f0 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -1173,7 +1173,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/policies/note_policy_spec.rb'
     - 'ee/spec/policies/path_lock_policy_spec.rb'
     - 'ee/spec/policies/project_snippet_policy_spec.rb'
-    - 'ee/spec/policies/protected_branch_policy_spec.rb'
     - 'ee/spec/policies/requirements_management/requirement_policy_spec.rb'
     - 'ee/spec/policies/saml_provider_policy_spec.rb'
     - 'ee/spec/policies/security/finding_policy_spec.rb'
@@ -4827,8 +4826,6 @@ RSpec/FeatureCategory:
     - 'spec/policies/project_member_policy_spec.rb'
     - 'spec/policies/project_snippet_policy_spec.rb'
     - 'spec/policies/project_statistics_policy_spec.rb'
-    - 'spec/policies/protected_branch_access_policy_spec.rb'
-    - 'spec/policies/protected_branch_policy_spec.rb'
     - 'spec/policies/release_policy_spec.rb'
     - 'spec/policies/system_hook_policy_spec.rb'
     - 'spec/policies/terraform/state_policy_spec.rb'
diff --git a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
index 0c8affcd964..45c060ebe03 100644
--- a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
+++ b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
@@ -344,8 +344,6 @@ SidekiqLoadBalancing/WorkerDataConsistency:
     - 'ee/app/workers/epics/new_epic_issue_worker.rb'
     - 'ee/app/workers/epics/update_cached_metadata_worker.rb'
     - 'ee/app/workers/epics/update_epics_dates_worker.rb'
-    - 'ee/app/workers/geo/batch/project_registry_scheduler_worker.rb'
-    - 'ee/app/workers/geo/batch/project_registry_worker.rb'
     - 'ee/app/workers/geo/batch_event_create_worker.rb'
     - 'ee/app/workers/geo/container_repository_sync_worker.rb'
     - 'ee/app/workers/geo/create_repository_updated_event_worker.rb'
@@ -353,17 +351,9 @@ SidekiqLoadBalancing/WorkerDataConsistency:
     - 'ee/app/workers/geo/event_worker.rb'
     - 'ee/app/workers/geo/file_removal_worker.rb'
     - 'ee/app/workers/geo/hashed_storage_attachments_migration_worker.rb'
-    - 'ee/app/workers/geo/hashed_storage_migration_worker.rb'
     - 'ee/app/workers/geo/metrics_update_worker.rb'
-    - 'ee/app/workers/geo/project_sync_worker.rb'
     - 'ee/app/workers/geo/prune_event_log_worker.rb'
-    - 'ee/app/workers/geo/rename_repository_worker.rb'
-    - 'ee/app/workers/geo/repositories_clean_up_worker.rb'
-    - 'ee/app/workers/geo/repository_cleanup_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/primary/single_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/secondary/single_worker.rb'
     - 'ee/app/workers/geo/reverification_batch_worker.rb'
-    - 'ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb'
     - 'ee/app/workers/geo/scheduler/scheduler_worker.rb'
     - 'ee/app/workers/geo/secondary/registry_consistency_worker.rb'
     - 'ee/app/workers/geo/secondary_usage_data_cron_worker.rb'
@@ -374,7 +364,6 @@ SidekiqLoadBalancing/WorkerDataConsistency:
     - 'ee/app/workers/geo/verification_state_backfill_worker.rb'
     - 'ee/app/workers/geo/verification_timeout_worker.rb'
     - 'ee/app/workers/geo/verification_worker.rb'
-    - 'ee/app/workers/geo_repository_destroy_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/schedule_refresh_seats_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/trials/apply_trial_worker.rb'
     - 'ee/app/workers/group_saml_group_sync_worker.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index 55a3320cedd..f3d93810758 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -1696,33 +1696,15 @@ Style/InlineDisableAnnotation:
     - 'ee/app/workers/emails/abandoned_trial_emails_cron_worker.rb'
     - 'ee/app/workers/epics/new_epic_issue_worker.rb'
     - 'ee/app/workers/epics/update_epics_dates_worker.rb'
-    - 'ee/app/workers/geo/batch/project_registry_scheduler_worker.rb'
-    - 'ee/app/workers/geo/batch/project_registry_worker.rb'
     - 'ee/app/workers/geo/bulk_mark_pending_batch_worker.rb'
     - 'ee/app/workers/geo/bulk_mark_verification_pending_batch_worker.rb'
     - 'ee/app/workers/geo/container_repository_sync_worker.rb'
     - 'ee/app/workers/geo/event_worker.rb'
     - 'ee/app/workers/geo/file_removal_worker.rb'
     - 'ee/app/workers/geo/hashed_storage_attachments_migration_worker.rb'
-    - 'ee/app/workers/geo/hashed_storage_migration_worker.rb'
     - 'ee/app/workers/geo/metrics_update_worker.rb'
     - 'ee/app/workers/geo/prune_event_log_worker.rb'
-    - 'ee/app/workers/geo/rename_repository_worker.rb'
-    - 'ee/app/workers/geo/repositories_clean_up_worker.rb'
-    - 'ee/app/workers/geo/repository_cleanup_worker.rb'
-    - 'ee/app/workers/geo/repository_shard_sync_worker.rb'
-    - 'ee/app/workers/geo/repository_sync_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/primary/batch_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/primary/shard_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/primary/single_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/secondary/scheduler_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/secondary/shard_worker.rb'
-    - 'ee/app/workers/geo/repository_verification/secondary/single_worker.rb'
-    - 'ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb'
-    - 'ee/app/workers/geo/scheduler/primary/per_shard_scheduler_worker.rb'
-    - 'ee/app/workers/geo/scheduler/primary/scheduler_worker.rb'
     - 'ee/app/workers/geo/scheduler/scheduler_worker.rb'
-    - 'ee/app/workers/geo/scheduler/secondary/per_shard_scheduler_worker.rb'
     - 'ee/app/workers/geo/scheduler/secondary/scheduler_worker.rb'
     - 'ee/app/workers/geo/secondary/registry_consistency_worker.rb'
     - 'ee/app/workers/geo/secondary_usage_data_cron_worker.rb'
@@ -1730,7 +1712,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/workers/geo/sync_timeout_cron_worker.rb'
     - 'ee/app/workers/geo/verification_cron_worker.rb'
     - 'ee/app/workers/geo/verification_state_backfill_worker.rb'
-    - 'ee/app/workers/geo_repository_destroy_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/add_on_purchases/schedule_bulk_refresh_user_assignments_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/notify_seats_exceeded_batch_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/refresh_seats_worker.rb'
diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml
index be1319c10bb..1808bb7fbb6 100644
--- a/.rubocop_todo/style/symbol_proc.yml
+++ b/.rubocop_todo/style/symbol_proc.yml
@@ -80,7 +80,6 @@ Style/SymbolProc:
     - 'ee/app/services/security/scanned_resources_counting_service.rb'
     - 'ee/app/services/timebox_report_service.rb'
     - 'ee/app/services/vulnerabilities/historical_statistics/deletion_service.rb'
-    - 'ee/app/workers/geo/batch/project_registry_worker.rb'
     - 'ee/app/workers/geo/sync_timeout_cron_worker.rb'
     - 'ee/app/workers/geo/verification_cron_worker.rb'
     - 'ee/lib/api/entities/pending_member.rb'