From d0efe2c07cdbd13698bfb70f9be7157ec4f7245b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 21 Jun 2013 16:42:59 +0300 Subject: [PATCH] Since masters_projects does not cover most of cases now we use authorized_projects for DeployKey read access --- app/models/user.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 2944b332dd8..ddea2da53e8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,8 +91,6 @@ class User < ActiveRecord::Base has_many :groups_projects, through: :groups, source: :projects 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 @@ -355,7 +353,7 @@ class User < ActiveRecord::Base end def accessible_deploy_keys - DeployKey.in_projects(self.master_projects).uniq + DeployKey.in_projects(self.authorized_projects).uniq end def created_by