Add latest changes from gitlab-org/gitlab@master

5 files changed, 21 insertions, 7 deletions

diff --git a/config/feature_flags/development/merge_request_delete_gitaly_refs_in_batches.yml b/config/feature_flags/development/merge_request_delete_gitaly_refs_in_batches.yml
new file mode 100644
index 00000000000..0f0b81dbbd2
--- /dev/null
+++ b/config/feature_flags/development/merge_request_delete_gitaly_refs_in_batches.yml
@@ -0,0 +1,8 @@
+---
+name: merge_request_delete_gitaly_refs_in_batches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125333
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416969
+milestone: '16.3'
+type: development
+group: group::gitaly
+default_enabled: false
diff --git a/config/feature_flags/development/notify_kas_on_git_push.yml b/config/feature_flags/development/pipeline_delete_gitaly_refs_in_batches.yml
index 32806418bce..66e23fa424a 100644
--- a/config/feature_flags/development/notify_kas_on_git_push.yml
+++ b/config/feature_flags/development/pipeline_delete_gitaly_refs_in_batches.yml
@@ -1,8 +1,8 @@
 ---
-name: notify_kas_on_git_push
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119168
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410429
-milestone: '16.0'
+name: pipeline_delete_gitaly_refs_in_batches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125333
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416969
+milestone: '16.3'
 type: development
-group: group::environments
-default_enabled: true
+group: group::gitaly
+default_enabled: false
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 6c7561ffb89..813d596df5f 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -664,6 +664,9 @@ Settings.cron_jobs['inactive_projects_deletion_cron_worker']['job_class'] = 'Pro
 Settings.cron_jobs['loose_foreign_keys_cleanup_worker'] ||= {}
 Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['cron'] ||= '*/1 * * * *'
 Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['job_class'] = 'LooseForeignKeys::CleanupWorker'
+Settings.cron_jobs['batched_git_ref_updates_cleanup_scheduler_worker'] ||= {}
+Settings.cron_jobs['batched_git_ref_updates_cleanup_scheduler_worker']['cron'] ||= '*/1 * * * *'
+Settings.cron_jobs['batched_git_ref_updates_cleanup_scheduler_worker']['job_class'] = 'BatchedGitRefUpdates::CleanupSchedulerWorker'
 Settings.cron_jobs['ci_runner_versions_reconciliation_worker'] ||= {}
 Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['cron'] ||= '@daily'
 Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['job_class'] = 'Ci::Runners::ReconcileExistingRunnerVersionsCronWorker'
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index 1fbe038f0bd..bfd737baec9 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -7,7 +7,8 @@ Gitlab::Database::Partitioning.register_models(
     LooseForeignKeys::DeletedRecord,
     Gitlab::Database::BackgroundMigration::BatchedJobTransitionLog,
     Ci::RunnerManagerBuild,
-    Ci::JobAnnotation
+    Ci::JobAnnotation,
+    BatchedGitRefUpdates::Deletion
   ])
 
 if Gitlab.ee?
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 7fe4db435a6..4f6889bf445 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -77,6 +77,8 @@
   - 1
 - - batched_background_migrations
   - 1
+- - batched_git_ref_updates_project_cleanup
+  - 1
 - - bitbucket_server_import_advance_stage
   - 1
 - - bitbucket_server_import_import_lfs_object