Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20230509144234_delete_drop_older_deployments_worker_queues.rb b/db/migrate/20230509144234_delete_drop_older_deployments_worker_queues.rb
new file mode 100644
index 00000000000..b6e3046e446
--- /dev/null
+++ b/db/migrate/20230509144234_delete_drop_older_deployments_worker_queues.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class DeleteDropOlderDeploymentsWorkerQueues < Gitlab::Database::Migration[2.1]
+  DEPRECATED_JOB_CLASSES = %w[
+    Deployments::DropOlderDeploymentsWorker
+  ]
+
+  disable_ddl_transaction!
+  def up
+    sidekiq_remove_jobs(job_klasses: DEPRECATED_JOB_CLASSES)
+  end
+
+  def down
+    # This migration removes any instances of deprecated workers and cannot be undone.
+  end
+end
diff --git a/db/schema_migrations/20230509144234 b/db/schema_migrations/20230509144234
new file mode 100644
index 00000000000..0116d971e38
--- /dev/null
+++ b/db/schema_migrations/20230509144234
@@ -0,0 +1 @@
+8c6d6a8d77dac3291f8af00e61c5ce0124c0742d0009f84b0d5bab7b43024bbe
\ No newline at end of file