diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-06 10:51:17 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-06 10:51:17 +0100 |
| commit | 797c2326c386437bbae711cf0ba9bc4eb6395492 (patch) | |
| tree | 2cb1f14952105a35928a9a972ec61970653a3422 | |
| parent | dec42e42013def7c948feafce2c866fa5c3413df (diff) | |
| parent | 8393e3e04b8b336ec80cb0da49d273f709043120 (diff) | |
| download | gitlab-ce-797c2326c386437bbae711cf0ba9bc4eb6395492.tar.gz | |
Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | doc/api/users.md | 7 | ||||
| -rw-r--r-- | lib/api/users.rb | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 191bb977feb..8140b1726f6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,9 @@ v 8.3.3 (unreleased) - Enable "Add key" button when user fills in a proper key (Stan Hu) v 8.3.2 + - Change single user API endpoint to return more detailed data (Michael Potthoff) + +v 8.3.2 (unreleased) - Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll (Stan Hu) - Add support for Google reCAPTCHA in user registration 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 |