diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
| commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
| tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/serializers/admin | |
| parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/serializers/admin')
| -rw-r--r-- | app/serializers/admin/user_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/admin/user_serializer.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/admin/user_entity.rb b/app/serializers/admin/user_entity.rb index ad96c101822..8908d610046 100644 --- a/app/serializers/admin/user_entity.rb +++ b/app/serializers/admin/user_entity.rb @@ -10,6 +10,7 @@ module Admin expose :email expose :last_activity_on expose :avatar_url + expose :note expose :badges do |user| user_badges_in_admin_section(user) end diff --git a/app/serializers/admin/user_serializer.rb b/app/serializers/admin/user_serializer.rb index 09036428bab..edd28e88553 100644 --- a/app/serializers/admin/user_serializer.rb +++ b/app/serializers/admin/user_serializer.rb @@ -2,6 +2,6 @@ module Admin class UserSerializer < BaseSerializer - entity UserEntity + entity Admin::UserEntity end end |