From edc4a56d26792b5b5bac21f45948412675ad7ebb Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 27 Mar 2015 14:43:48 +0100 Subject: Allow admin to create public deploy keys that are accessible to any project. --- app/models/deploy_keys_project.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/models/deploy_keys_project.rb') diff --git a/app/models/deploy_keys_project.rb b/app/models/deploy_keys_project.rb index 7e88903b9af..5f679f4b3ef 100644 --- a/app/models/deploy_keys_project.rb +++ b/app/models/deploy_keys_project.rb @@ -22,6 +22,10 @@ class DeployKeysProject < ActiveRecord::Base private def destroy_orphaned_deploy_key - self.deploy_key.destroy if self.deploy_key.deploy_keys_projects.length == 0 + # Public deploy keys are never automatically deleted + return if self.deploy_key.public? + return if self.deploy_key.deploy_keys_projects.length > 0 + + self.deploy_key.destroy end end -- cgit v1.2.3