diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-03 12:22:44 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-03 12:28:47 +0200 |
| commit | ed097df62758880eb6412770f661266d4a6e9299 (patch) | |
| tree | 488f682bac4c5c9762823a1055f85f9e5c88eca0 /app/models/deploy_keys_project.rb | |
| parent | a243e44ca1ee57dc28ef72bd3521c17726ba5026 (diff) | |
| download | gitlab-ce-ed097df62758880eb6412770f661266d4a6e9299.tar.gz | |
Clean up code.
Diffstat (limited to 'app/models/deploy_keys_project.rb')
| -rw-r--r-- | app/models/deploy_keys_project.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/deploy_keys_project.rb b/app/models/deploy_keys_project.rb index 5f679f4b3ef..18db521741f 100644 --- a/app/models/deploy_keys_project.rb +++ b/app/models/deploy_keys_project.rb @@ -22,10 +22,8 @@ class DeployKeysProject < ActiveRecord::Base private def destroy_orphaned_deploy_key - # Public deploy keys are never automatically deleted - return if self.deploy_key.public? - return if self.deploy_key.deploy_keys_projects.length > 0 - + return unless self.deploy_key.destroyed_when_orphaned? && self.deploy_key.orphaned? + self.deploy_key.destroy end end |