Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index 2563fd484f1..aaafa396337 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -19,7 +19,7 @@ class DeployKey < Key
   scope :with_projects, -> { includes(deploy_keys_projects: { project: [:route, namespace: :route] }) }
   scope :including_projects_with_write_access, -> { includes(:projects_with_write_access) }
 
-  accepts_nested_attributes_for :deploy_keys_projects
+  accepts_nested_attributes_for :deploy_keys_projects, reject_if: :reject_deploy_keys_projects?
 
   def private?
     !public?
@@ -72,4 +72,10 @@ class DeployKey < Key
   def impersonated?
     false
   end
+
+  private
+
+  def reject_deploy_keys_projects?
+    !self.valid?
+  end
 end