Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 4 insertions, 13 deletions

diff --git a/db/post_migrate/20231001105945_requeue_backfill_finding_id_in_vulnerabilities.rb b/db/post_migrate/20231001105945_requeue_backfill_finding_id_in_vulnerabilities.rb
index 8115ad199ce..9004176595e 100644
--- a/db/post_migrate/20231001105945_requeue_backfill_finding_id_in_vulnerabilities.rb
+++ b/db/post_migrate/20231001105945_requeue_backfill_finding_id_in_vulnerabilities.rb
@@ -8,18 +8,9 @@ class RequeueBackfillFindingIdInVulnerabilities < Gitlab::Database::Migration[2.
 
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
-  def up
-    queue_batched_background_migration(
-      MIGRATION,
-      :vulnerabilities,
-      :id,
-      job_interval: DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      sub_batch_size: SUB_BATCH_SIZE
-    )
-  end
+  # marking no-op
+  # per https://docs.gitlab.com/ee/development/database/batched_background_migrations.html#requeuing-batched-background-migrations
+  def up; end
 
-  def down
-    delete_batched_background_migration(MIGRATION, :vulnerabilities, :id, [])
-  end
+  def down; end
 end