Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 17 insertions, 0 deletions

diff --git a/db/post_migrate/20220328095848_delete_failed_reset_duplicate_ci_runners_token_migration_records.rb b/db/post_migrate/20220328095848_delete_failed_reset_duplicate_ci_runners_token_migration_records.rb
new file mode 100644
index 00000000000..3c1a6a48ef5
--- /dev/null
+++ b/db/post_migrate/20220328095848_delete_failed_reset_duplicate_ci_runners_token_migration_records.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DeleteFailedResetDuplicateCiRunnersTokenMigrationRecords < Gitlab::Database::Migration[1.0]
+  def up
+    # Delete remaining records of botched migrations before we start the new migrations
+    Gitlab::Database::BackgroundMigrationJob
+      .for_migration_class('ResetDuplicateCiRunnersTokenValuesOnProjects')
+      .delete_all
+    Gitlab::Database::BackgroundMigrationJob
+      .for_migration_class('ResetDuplicateCiRunnersTokenEncryptedValuesOnProjects')
+      .delete_all
+  end
+
+  def down
+    # no-op
+  end
+end