kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Don't preload all memberships for a user

Browse source
This commit is contained in:
Bob Van Landuyt 2017-10-10 16:25:26 +02:00
parent 6f5a2276d7
commit b9c12be5b9
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/user.rb
View file

@ -1073,15 +1073,6 @@ class User < ActiveRecord::Base
super
end
# Get the membership for an object without loading the source of the membership
#
# This loads the entire `members` relation of the user, used on `current_user`
def membership_for_object(object)
members.sort('access_level_asc').detect do |member|
object.is_a?(member.source_type.constantize) && member.source_id == object.id
end
end
protected
# override, from Devise::Validatable

2
app/serializers/group_child_entity.rb
View file

@ -72,7 +72,7 @@ class GroupChildEntity < Grape::Entity
def membership
return unless request.current_user
@membership ||= request.current_user.membership_for_object(object)
@membership ||= request.current_user.members.find_by(source: object)
end
def project?