diff options
author | Stan Hu <stanhu@gmail.com> | 2016-07-25 16:21:55 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-07-27 02:53:39 +0300 |
commit | 871723da7fa6b341b64197e27c6bd99d52f2dcd8 (patch) | |
tree | ca49827a4c589d8402a380276d4ae6ca5bc916ce /app/models/project_team.rb | |
parent | d1ea2bca61dff21948024d897e1d4475123a10e8 (diff) |
Incorporate review comments
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r-- | app/models/project_team.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb index 67faea1f9f3..21b3a013673 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -138,20 +138,20 @@ class ProjectTeam def max_member_access_for_user_ids(user_ids) user_ids = user_ids.uniq key = "max_member_access:#{project.id}" - RequestStore.store[key] ||= Hash.new + RequestStore.store[key] ||= {} access = RequestStore.store[key] # Lookup only the IDs we need user_ids = user_ids - access.keys if user_ids.present? - user_ids.map { |id| access[id] = Gitlab::Access::NO_ACCESS } + user_ids.each { |id| access[id] = Gitlab::Access::NO_ACCESS } - member_access = project.members.where(user_id: user_ids).has_access.pluck(:user_id, :access_level).to_h + member_access = project.members.access_for_user_ids(user_ids) merge_max!(access, member_access) if group - group_access = group.members.where(user_id: user_ids).has_access.pluck(:user_id, :access_level).to_h + group_access = group.members.access_for_user_ids(user_ids) merge_max!(access, group_access) end |