diff options
author | Michi302 <michi302@michi302.de> | 2015-12-28 15:50:44 +0100 |
---|---|---|
committer | Michi302 <michi302@michi302.de> | 2015-12-28 15:50:44 +0100 |
commit | 141b8b67ff4cbe67778ff6815a51f49834e290b9 (patch) | |
tree | 72af73e495c03270eebc4945e299bebfa1590aac | |
parent | 540eb0a9affef14329418b32be0dcd60f2b66e29 (diff) | |
download | gitlab-ce-141b8b67ff4cbe67778ff6815a51f49834e290b9.tar.gz |
Make single user API endpoint return Entities::User instead of Entities::UserBasic
-rw-r--r-- | doc/api/users.md | 7 | ||||
-rw-r--r-- | lib/api/users.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 66d2fd52526..773fe36d277 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -123,6 +123,13 @@ Parameters: "name": "John Smith", "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", + "created_at": "2012-05-23T08:00:58Z", + "is_admin": false, + "bio": null, + "skype": "", + "linkedin": "", + "twitter": "", + "website_url": "" } ``` diff --git a/lib/api/users.rb b/lib/api/users.rb index 3400f0713ef..0d7813428e2 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -39,7 +39,7 @@ module API if current_user.is_admin? present @user, with: Entities::UserFull else - present @user, with: Entities::UserBasic + present @user, with: Entities::User end end |