Add latest changes from gitlab-org/security/gitlab@18-0-stable-ee

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

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

db/schema_migrations/20250519155241

@@ -0,0 +1 @@
+d10874ff2a9242306d052ffc06114dd40be1e7f900fe650f0e2e79a20c0887ef