Merge branch 'master' into deploy_keys

[wvm/gitlab.git] / app / models / project.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index 33dd85e..06b9e71 100644 (file)
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -14,6 +14,7 @@ class Project < ActiveRecord::Base
   has_many :users, :through => :users_projects
   has_many :notes, :dependent => :destroy
   has_many :snippets, :dependent => :destroy
+  has_many :deploy_keys, :dependent => :destroy
   has_many :web_hooks, :dependent => :destroy
 
   acts_as_taggable