Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42

1 files changed, 22 insertions, 0 deletions

diff --git a/db/post_migrate/20231219075929_finalize_backfill_user_preferences_with_defaults.rb b/db/post_migrate/20231219075929_finalize_backfill_user_preferences_with_defaults.rb
new file mode 100644
index 00000000000..fb10385ad20
--- /dev/null
+++ b/db/post_migrate/20231219075929_finalize_backfill_user_preferences_with_defaults.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillUserPreferencesWithDefaults < Gitlab::Database::Migration[2.2]
+  milestone '16.8'
+  disable_ddl_transaction!
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = "BackfillUserPreferencesWithDefaults"
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: MIGRATION,
+      table_name: 'user_preferences',
+      column_name: 'id',
+      job_arguments: []
+    )
+  end
+
+  def down
+    # no-op
+  end
+end