Add latest changes from gitlab-org/gitlab@master

3 files changed, 23 insertions, 0 deletions

diff --git a/db/docs/batched_background_migrations/backfill_missing_ci_cd_settings.yml b/db/docs/batched_background_migrations/backfill_missing_ci_cd_settings.yml
index 6ecc67531ef..5299b6dd414 100644
--- a/db/docs/batched_background_migrations/backfill_missing_ci_cd_settings.yml
+++ b/db/docs/batched_background_migrations/backfill_missing_ci_cd_settings.yml
@@ -5,3 +5,4 @@ feature_category: source_code_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124921
 queued_migration_version: 20230628023103
 milestone: '16.2'
+finalized_by: '20231207220916'
diff --git a/db/post_migrate/20231207220916_finalize_backfill_missing_ci_cd_settings.rb b/db/post_migrate/20231207220916_finalize_backfill_missing_ci_cd_settings.rb
new file mode 100644
index 00000000000..486df165883
--- /dev/null
+++ b/db/post_migrate/20231207220916_finalize_backfill_missing_ci_cd_settings.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillMissingCiCdSettings < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillMissingCiCdSettings',
+      table_name: :projects,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20231207220916 b/db/schema_migrations/20231207220916
new file mode 100644
index 00000000000..4cdc27dd6cf
--- /dev/null
+++ b/db/schema_migrations/20231207220916
@@ -0,0 +1 @@
+0e9fb2131d80df2705c182b218d117880ceab95b428ba1afac8f4bb8ba73859f
\ No newline at end of file