Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

1 files changed, 22 insertions, 0 deletions

diff --git a/db/post_migrate/20230823143519_remove_users_notification_settings_user_id_fk.rb b/db/post_migrate/20230823143519_remove_users_notification_settings_user_id_fk.rb
new file mode 100644
index 00000000000..2e8b634e108
--- /dev/null
+++ b/db/post_migrate/20230823143519_remove_users_notification_settings_user_id_fk.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class RemoveUsersNotificationSettingsUserIdFk < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  FOREIGN_KEY_NAME = "fk_0c95e91db7"
+
+  def up
+    return unless foreign_key_exists?(:notification_settings, :users, name: FOREIGN_KEY_NAME)
+
+    with_lock_retries do
+      remove_foreign_key_if_exists(:notification_settings, :users,
+        name: FOREIGN_KEY_NAME, reverse_lock_order: true)
+    end
+  end
+
+  def down
+    add_concurrent_foreign_key(:notification_settings, :users,
+      name: FOREIGN_KEY_NAME, column: :user_id,
+      target_column: :id, on_delete: :cascade)
+  end
+end