Download as
Browse Code »

Commit d0efe2c07cdbd13698bfb70f9be7157ec4f7245b

Authored by Dmitriy Zaporozhets
1 parent b1dbabde
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Since masters_projects does not cover most of cases now we use authorized_projec… 

…ts for DeployKey read access
Showing 1 changed file with 1 additions and 3 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @d0efe2c
... ... @@ -91,8 +91,6 @@ class User < ActiveRecord::Base
91 91 has_many :groups_projects, through: :groups, source: :projects
92 92 has_many :personal_projects, through: :namespace, source: :projects
93 93 has_many :projects, through: :users_projects
94   - has_many :master_projects, through: :users_projects, source: :project,
95   - conditions: { users_projects: { project_access: UsersProject::MASTER } }
96 94 has_many :own_projects, foreign_key: :creator_id, class_name: 'Project'
97 95 has_many :owned_projects, through: :namespaces, source: :projects
98 96  
... ... @@ -355,7 +353,7 @@ class User < ActiveRecord::Base
355 353 end
356 354  
357 355 def accessible_deploy_keys
358   - DeployKey.in_projects(self.master_projects).uniq
  356 + DeployKey.in_projects(self.authorized_projects).uniq
359 357 end
360 358  
361 359 def created_by
... ...