diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-21 16:42:59 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-21 16:42:59 +0300 |
commit | d0efe2c07cdbd13698bfb70f9be7157ec4f7245b (patch) | |
tree | db2f3b016e0c13c63ce6025da080b957538fd820 | |
parent | b1dbabdec30d8e03afb0155b9494cfe2ef351352 (diff) | |
download | gitlab-ce-d0efe2c07cdbd13698bfb70f9be7157ec4f7245b.tar.gz |
Since masters_projects does not cover most of cases now we use authorized_projects for DeployKey read access
-rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 1 insertions, 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 |