Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 2 insertions, 14 deletions

diff --git a/db/post_migrate/20230412141541_reschedule_links_avoiding_duplication.rb b/db/post_migrate/20230412141541_reschedule_links_avoiding_duplication.rb
index 9c6213c60ee..8449acb33e1 100644
--- a/db/post_migrate/20230412141541_reschedule_links_avoiding_duplication.rb
+++ b/db/post_migrate/20230412141541_reschedule_links_avoiding_duplication.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop: disable BackgroundMigration/MissingDictionaryFile
-
 class RescheduleLinksAvoidingDuplication < Gitlab::Database::Migration[2.1]
   MIGRATION = 'MigrateLinksForVulnerabilityFindings'
   DELAY_INTERVAL = 2.minutes
@@ -13,20 +11,10 @@ class RescheduleLinksAvoidingDuplication < Gitlab::Database::Migration[2.1]
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
   def up
-    delete_batched_background_migration(MIGRATION, :vulnerability_occurrences, :id, [])
-
-    queue_batched_background_migration(
-      MIGRATION,
-      :vulnerability_occurrences,
-      :id,
-      job_interval: DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      sub_batch_size: SUB_BATCH_SIZE
-    )
+    # no-op as it is rescheduled via db/post_migrate/20230412141541_reschedule_links_avoiding_duplication.rb
   end
 
   def down
-    delete_batched_background_migration(MIGRATION, :vulnerability_occurrences, :id, [])
+    # no-op as it is rescheduled via db/post_migrate/20230412141541_reschedule_links_avoiding_duplication.rb
   end
 end
-# rubocop: enable BackgroundMigration/MissingDictionaryFile