Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 21 insertions, 0 deletions

diff --git a/db/post_migrate/20230607093222_remove_webauthn_registrations_u2f_registration_id_column.rb b/db/post_migrate/20230607093222_remove_webauthn_registrations_u2f_registration_id_column.rb
new file mode 100644
index 00000000000..6e861fc258a
--- /dev/null
+++ b/db/post_migrate/20230607093222_remove_webauthn_registrations_u2f_registration_id_column.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveWebauthnRegistrationsU2fRegistrationIdColumn < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_webauthn_registrations_on_u2f_registration_id'
+
+  def up
+    remove_column :webauthn_registrations, :u2f_registration_id
+  end
+
+  def down
+    add_column :webauthn_registrations, :u2f_registration_id, :integer
+
+    add_concurrent_index(
+      :webauthn_registrations,
+      :u2f_registration_id,
+      name: INDEX_NAME,
+      where: 'u2f_registration_id IS NOT NULL')
+  end
+end