Selectable deploy keys contain master projects

2 files changed, 5 insertions, 3 deletions

diff --git a/app/controllers/deploy_keys_controller.rb b/app/controllers/deploy_keys_controller.rb
index 1c7e4c1b37a..35d28becd05 100644
--- a/app/controllers/deploy_keys_controller.rb
+++ b/app/controllers/deploy_keys_controller.rb
@@ -54,6 +54,6 @@ class DeployKeysController < ProjectResourceController
   protected
 
   def available_keys
-    @available_keys ||= current_user.owned_deploy_keys
+    @available_keys ||= current_user.accessible_deploy_keys
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 0aed0ada757..a1244f9a489 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -90,6 +90,8 @@ class User < ActiveRecord::Base
 
   has_many :personal_projects,        through: :namespace, source: :projects
   has_many :projects,                 through: :users_projects
+  has_many :master_projects,          through: :users_projects, source: :project,
+                                      conditions: { users_projects: { project_access: UsersProject::MASTER } }
   has_many :own_projects,             foreign_key: :creator_id, class_name: 'Project'
   has_many :owned_projects,           through: :namespaces, source: :projects
 
@@ -354,7 +356,7 @@ class User < ActiveRecord::Base
     extern_uid && provider == 'ldap'
   end
 
-  def owned_deploy_keys
-    DeployKey.in_projects(self.owned_projects).uniq
+  def accessible_deploy_keys
+    DeployKey.in_projects(self.master_projects).uniq
   end
 end