Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 22 insertions, 0 deletions

diff --git a/db/post_migrate/20211118130836_drop_pages_deployments_builds_fk.rb b/db/post_migrate/20211118130836_drop_pages_deployments_builds_fk.rb
new file mode 100644
index 00000000000..5eb532f2a00
--- /dev/null
+++ b/db/post_migrate/20211118130836_drop_pages_deployments_builds_fk.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class DropPagesDeploymentsBuildsFk < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  FK_NAME = 'fk_rails_c3a90cf29b'
+
+  def up
+    remove_foreign_key_if_exists(:pages_deployments, :ci_builds, name: FK_NAME)
+  end
+
+  def down
+    add_concurrent_foreign_key(
+      :pages_deployments,
+      :ci_builds,
+      name: FK_NAME,
+      column: :ci_build_id,
+      target_column: :id,
+      on_delete: :nullify
+    )
+  end
+end