From da9c426549ab98dec71d4f30bf9f4c19f16c7d98 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 21 May 2025 17:08:43 +0000
Subject: [PATCH] Add latest changes from
 gitlab-org/security/gitlab@18-0-stable-ee

---
 ...dd_not_null_to_fork_networks_organization_id.rb |  4 ++--
 ...dd_not_null_organization_id_on_fork_networks.rb | 14 ++++++++++++++
 db/schema_migrations/20250519155241                |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 db/post_migrate/20250519155241_add_not_null_organization_id_on_fork_networks.rb
 create mode 100644 db/schema_migrations/20250519155241

diff --git a/db/migrate/20250415124320_add_not_null_to_fork_networks_organization_id.rb b/db/migrate/20250415124320_add_not_null_to_fork_networks_organization_id.rb
index d8138ad66fa..ad1a099a578 100644
--- a/db/migrate/20250415124320_add_not_null_to_fork_networks_organization_id.rb
+++ b/db/migrate/20250415124320_add_not_null_to_fork_networks_organization_id.rb
@@ -6,10 +6,10 @@ class AddNotNullToForkNetworksOrganizationId < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
   def up
-    change_column_null :fork_networks, :organization_id, false
+    # no-op due to https://gitlab.com/gitlab-org/gitlab/-/issues/543167#note_2512131075
   end
 
   def down
-    change_column_null :fork_networks, :organization_id, true
+    # no-op due to https://gitlab.com/gitlab-org/gitlab/-/issues/543167#note_2512131075
   end
 end
diff --git a/db/post_migrate/20250519155241_add_not_null_organization_id_on_fork_networks.rb b/db/post_migrate/20250519155241_add_not_null_organization_id_on_fork_networks.rb
new file mode 100644
index 00000000000..cabee2c8984
--- /dev/null
+++ b/db/post_migrate/20250519155241_add_not_null_organization_id_on_fork_networks.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddNotNullOrganizationIdOnForkNetworks < Gitlab::Database::Migration[2.3]
+  disable_ddl_transaction!
+  milestone '18.1'
+
+  def up
+    change_column_null :fork_networks, :organization_id, false
+  end
+
+  def down
+    change_column_null :fork_networks, :organization_id, true
+  end
+end
diff --git a/db/schema_migrations/20250519155241 b/db/schema_migrations/20250519155241
new file mode 100644
index 00000000000..745ddeed38a
--- /dev/null
+++ b/db/schema_migrations/20250519155241
@@ -0,0 +1 @@
+d10874ff2a9242306d052ffc06114dd40be1e7f900fe650f0e2e79a20c0887ef
\ No newline at end of file