diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /lib/api/entities/user.rb | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'lib/api/entities/user.rb')
-rw-r--r-- | lib/api/entities/user.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/entities/user.rb b/lib/api/entities/user.rb index 4a1f570c3f0..adf954ab02d 100644 --- a/lib/api/entities/user.rb +++ b/lib/api/entities/user.rb @@ -3,8 +3,12 @@ module API module Entities class User < UserBasic + include UsersHelper expose :created_at, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) } expose :bio, :location, :public_email, :skype, :linkedin, :twitter, :website_url, :organization, :job_title + expose :work_information do |user| + work_information(user) + end end end end |