diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/serializers/member_entity.rb | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/serializers/member_entity.rb')
-rw-r--r-- | app/serializers/member_entity.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/serializers/member_entity.rb b/app/serializers/member_entity.rb index d7221109ecb..f2f97f560e0 100644 --- a/app/serializers/member_entity.rb +++ b/app/serializers/member_entity.rb @@ -63,6 +63,12 @@ class MemberEntity < Grape::Entity member.respond_to?(:invited_user_state) ? member.invited_user_state : "" end end + + private + + def current_user + options[:current_user] + end end MemberEntity.prepend_mod_with('MemberEntity') |