Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20230428134334_delete_create_cross_project_pipeline_worker_job_instances.rb b/db/migrate/20230428134334_delete_create_cross_project_pipeline_worker_job_instances.rb
new file mode 100644
index 00000000000..517f85c0c1f
--- /dev/null
+++ b/db/migrate/20230428134334_delete_create_cross_project_pipeline_worker_job_instances.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class DeleteCreateCrossProjectPipelineWorkerJobInstances < Gitlab::Database::Migration[2.1]
+  DEPRECATED_JOB_CLASSES = %w[
+    CreateCrossProjectPipelineWorker
+  ]
+
+  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/20230428134334 b/db/schema_migrations/20230428134334
new file mode 100644
index 00000000000..96e5841736f
--- /dev/null
+++ b/db/schema_migrations/20230428134334
@@ -0,0 +1 @@
+43d27869d87ec93da96fbc9ea23f50b7588d5f491b1d5c53beeed7a529003e09
\ No newline at end of file