summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-15 18:34:57 +0200
committerRémy Coutable <remy@rymai.me>2016-09-16 17:18:26 +0200
commitd8dd1c1940c929eab324951e3c302d197c5f0dda (patch)
treeb691e1d71dfe7d2d50efffad82a4b9af7dfeb76c /lib/api/entities.rb
parent7afee665b091f2afb89f0fdda90fa46d56d3e341 (diff)
downloadgitlab-ce-d8dd1c1940c929eab324951e3c302d197c5f0dda.tar.gz
Ensure invitees are not returned in Members API
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index bfee4b6c752..cbc5aa0f75d 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -104,18 +104,18 @@ module API
class Member < UserBasic
expose :access_level do |user, options|
- member = options[:member] || options[:members].find { |m| m.user_id == user.id }
+ member = options[:member] || options[:source].members.find_by(user_id: user.id)
member.access_level
end
expose :expires_at do |user, options|
- member = options[:member] || options[:members].find { |m| m.user_id == user.id }
+ member = options[:member] || options[:source].members.find_by(user_id: user.id)
member.expires_at
end
end
class AccessRequester < UserBasic
expose :requested_at do |user, options|
- access_requester = options[:access_requester] || options[:access_requesters].find { |m| m.user_id == user.id }
+ access_requester = options[:access_requester] || options[:source].requesters.find_by(user_id: user.id)
access_requester.requested_at
end
end