Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce
This commit is contained in:
commit
797c2326c3
|
@ -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
|
||||
|
||||
|
|
|
@ -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": ""
|
||||
}
|
||||
```
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue