diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 14:42:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 14:42:44 +0300 |
| commit | 15c040a6bd71894260b66a90685070c0babfee76 (patch) | |
| tree | 27021108f64428697744973cddaede55930f4ef7 /app/serializers | |
| parent | 6e4e4023b46c786a99e1cfe8832fa5eff2728e0d (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/member_entity.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/member_entity.rb b/app/serializers/member_entity.rb index 7559a03bd3b..5100a41638e 100644 --- a/app/serializers/member_entity.rb +++ b/app/serializers/member_entity.rb @@ -40,7 +40,9 @@ class MemberEntity < Grape::Entity expose :valid_level_roles, as: :valid_roles - expose :user, if: -> (member) { member.user.present? }, using: MemberUserEntity + expose :user, if: -> (member) { member.user.present? } do |member, options| + MemberUserEntity.represent(member.user, source: options[:source]) + end expose :invite, if: -> (member) { member.invite? } do expose :email do |member| |