diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 09:07:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 09:07:54 +0000 |
commit | 87ef501eacd66d7166183d20d84e33de022f7002 (patch) | |
tree | fa4e0f41e00a4b6aeb035530be4b5473f51b7a3d /lib | |
parent | f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab (diff) | |
download | gitlab-ce-87ef501eacd66d7166183d20d84e33de022f7002.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/entities/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities/user.rb b/lib/api/entities/user.rb index 15e4619cdb8..4a1f570c3f0 100644 --- a/lib/api/entities/user.rb +++ b/lib/api/entities/user.rb @@ -4,7 +4,7 @@ module API module Entities class User < UserBasic 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 + expose :bio, :location, :public_email, :skype, :linkedin, :twitter, :website_url, :organization, :job_title end end end |