Add latest changes from gitlab-org/gitlab@13-7-stable-ee

2 files changed, 31 insertions, 0 deletions

diff --git a/db/post_migrate/20201110161542_cleanup_transfered_projects_shared_runners.rb b/db/post_migrate/20201110161542_cleanup_transfered_projects_shared_runners.rb
new file mode 100644
index 00000000000..5e907092e83
--- /dev/null
+++ b/db/post_migrate/20201110161542_cleanup_transfered_projects_shared_runners.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class CleanupTransferedProjectsSharedRunners < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  BATCH_SIZE = 25_000
+  INTERVAL = 3.minutes
+  MIGRATION = 'ResetSharedRunnersForTransferredProjects'
+
+  disable_ddl_transaction!
+
+  class Namespace < ActiveRecord::Base
+    include EachBatch
+
+    self.table_name = 'namespaces'
+  end
+
+  def up
+    queue_background_migration_jobs_by_range_at_intervals(Namespace,
+                                                          MIGRATION,
+                                                          INTERVAL,
+                                                          batch_size: BATCH_SIZE)
+  end
+
+  def down
+    # This migration fixes an inconsistent database state resulting from https://gitlab.com/gitlab-org/gitlab/-/issues/271728
+    # and as such does not require a down migration
+  end
+end
diff --git a/db/schema_migrations/20201110161542 b/db/schema_migrations/20201110161542
new file mode 100644
index 00000000000..1d4ca947738
--- /dev/null
+++ b/db/schema_migrations/20201110161542
@@ -0,0 +1 @@
+ebc304867bab499da3f9fa69b32373a328948b5068b226df5166042d1c1c7604
\ No newline at end of file