diff options
| author | Sean Packham <seanpackham@gitlab.com> | 2016-09-27 15:42:35 +0100 |
|---|---|---|
| committer | Sean Packham <seanpackham@gitlab.com> | 2016-09-27 15:42:35 +0100 |
| commit | 1aad8f2f0f68f7ba1811a3fff48b181af85f752d (patch) | |
| tree | a8d45620ef22fa4a553de813254add25a998ee8c /lib/api/entities.rb | |
| parent | 0ef54d504c90146ffdbff5c699a40c689127b369 (diff) | |
| parent | 7b42ff6306bccc63a70f6731ce92974ec0a5e12b (diff) | |
| download | gitlab-ce-1aad8f2f0f68f7ba1811a3fff48b181af85f752d.tar.gz | |
Merge branch 'master' into add-university-content
Diffstat (limited to 'lib/api/entities.rb')
| -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 92a6f29adb0..0adc118ba27 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -15,7 +15,7 @@ module API class User < UserBasic expose :created_at expose :is_admin?, as: :is_admin - expose :bio, :location, :skype, :linkedin, :twitter, :website_url + expose :bio, :location, :skype, :linkedin, :twitter, :website_url, :organization end class Identity < Grape::Entity |