diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-09 09:38:48 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-09 11:39:45 +0200 |
| commit | 9b2ad62a069961391ea7492a51eaad88ad2fce46 (patch) | |
| tree | e2fb0daa028721e9a6c03daefcd75962a4357864 /app/models/project.rb | |
| parent | 51f40a919a6686203ffc638a1c82e179811959cb (diff) | |
| download | gitlab-ce-17932-move-to-project-dropdown-bulk-load.tar.gz | |
Load project members, group members in bulk and cache it17932-move-to-project-dropdown-bulk-load
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index a667857d058..032da005e60 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -109,11 +109,11 @@ class Project < ActiveRecord::Base has_many :hooks, dependent: :destroy, class_name: 'ProjectHook' has_many :protected_branches, dependent: :destroy - has_many :project_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source, class_name: 'ProjectMember' + has_many :project_members, -> { merge(Member.non_request) }, dependent: :destroy, as: :source, class_name: 'ProjectMember' alias_method :members, :project_members has_many :users, through: :project_members - has_many :requesters, -> { where.not(requested_at: nil) }, dependent: :destroy, as: :source, class_name: 'ProjectMember' + has_many :requesters, -> { merge(Member.request) }, dependent: :destroy, as: :source, class_name: 'ProjectMember' has_many :deploy_keys_projects, dependent: :destroy has_many :deploy_keys, through: :deploy_keys_projects |