diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/serializers/user_entity.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/serializers/user_entity.rb')
-rw-r--r-- | app/serializers/user_entity.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/user_entity.rb b/app/serializers/user_entity.rb index 8909ae8df2c..9386c06b87a 100644 --- a/app/serializers/user_entity.rb +++ b/app/serializers/user_entity.rb @@ -2,3 +2,5 @@ class UserEntity < API::Entities::UserPath end + +UserEntity.prepend_if_ee('EE::UserEntity') |