diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-09-27 10:10:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-27 10:10:40 +0000 |
| commit | d5bce06df1ec36371db208d0aaf42d849eb63bcf (patch) | |
| tree | 3edc5cc74bc4b13d0238bc053b85804bc1ea30d6 /lib | |
| parent | babb05a1406d4889f90953bdb16d736b22ce6c21 (diff) | |
| parent | f920d996e34dfb8f8933ff7c5798fa1a72c357b6 (diff) | |
| download | gitlab-ce-d5bce06df1ec36371db208d0aaf42d849eb63bcf.tar.gz | |
Merge branch 'feature/add-public-email-to-users-api' into 'master'
Feature/add public email to users api
Closes #39346
See merge request gitlab-org/gitlab-ce!21909
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 0fec3dc3dc4..12c4340c1ba 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -53,7 +53,7 @@ module API class User < UserBasic expose :created_at, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) } - expose :bio, :location, :skype, :linkedin, :twitter, :website_url, :organization + expose :bio, :location, :public_email, :skype, :linkedin, :twitter, :website_url, :organization end class UserActivity < Grape::Entity |