Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 21 insertions, 0 deletions

diff --git a/db/post_migrate/20230109145018_remove_namespaces_application_settings_custom_project_templates_group_id_fk.rb b/db/post_migrate/20230109145018_remove_namespaces_application_settings_custom_project_templates_group_id_fk.rb
new file mode 100644
index 00000000000..cfc915f57b4
--- /dev/null
+++ b/db/post_migrate/20230109145018_remove_namespaces_application_settings_custom_project_templates_group_id_fk.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveNamespacesApplicationSettingsCustomProjectTemplatesGroupIdFk < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  def up
+    return unless foreign_key_exists?(:application_settings, :namespaces, name: "fk_rails_b53e481273")
+
+    with_lock_retries do
+      execute('LOCK namespaces, application_settings IN ACCESS EXCLUSIVE MODE') if transaction_open?
+
+      remove_foreign_key_if_exists(:application_settings, :namespaces, name: "fk_rails_b53e481273")
+    end
+  end
+
+  def down
+    add_concurrent_foreign_key(:application_settings, :namespaces,
+      name: "fk_rails_b53e481273", column: :custom_project_templates_group_id,
+      target_column: :id, on_delete: :nullify)
+  end
+end