Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 27 insertions, 0 deletions

diff --git a/db/post_migrate/20221130192239_fix_approval_project_rules_without_protected_branches.rb b/db/post_migrate/20221130192239_fix_approval_project_rules_without_protected_branches.rb
new file mode 100644
index 00000000000..9cfe958ff60
--- /dev/null
+++ b/db/post_migrate/20221130192239_fix_approval_project_rules_without_protected_branches.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class FixApprovalProjectRulesWithoutProtectedBranches < Gitlab::Database::Migration[2.0]
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 500
+  MIGRATION = 'FixApprovalProjectRulesWithoutProtectedBranches'
+  INTERVAL = 2.minutes
+
+  def up
+    return unless Gitlab.ee?
+
+    queue_batched_background_migration(
+      MIGRATION,
+      :approval_project_rules,
+      :id,
+      job_interval: INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(MIGRATION, :approval_project_rules, :id, [])
+  end
+end