Create DeployKey & DeployKeysProject models. Bulding many to many relation between deploy keys and projects

1 files changed, 3 insertions, 8 deletions

diff --git a/app/models/key.rb b/app/models/key.rb
index ce62b802c0d..31fb522f3ff 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -16,7 +16,6 @@ require 'digest/md5'
 
 class Key < ActiveRecord::Base
   belongs_to :user
-  belongs_to :project
 
   attr_accessible :key, :title
 
@@ -29,7 +28,7 @@ class Key < ActiveRecord::Base
   delegate :name, :email, to: :user, prefix: true
 
   def strip_white_space
-    self.key = self.key.strip unless self.key.blank?
+    self.key = key.strip unless key.blank?
   end
 
   def fingerprintable_key
@@ -53,14 +52,10 @@ class Key < ActiveRecord::Base
 
   # projects that has this key
   def projects
-    if is_deploy_key
-      [project]
-    else
-      user.authorized_projects
-    end
+    user.authorized_projects
   end
 
   def shell_id
-    "key-#{self.id}"
+    "key-#{id}"
   end
 end