Add fields to GET /users/* API endpoints for admins
Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840
This commit is contained in:
parent
f8c4dc9723
commit
b0d24ab1b5
4 changed files with 7 additions and 0 deletions
|
@ -7,6 +7,7 @@ v 8.6.0 (unreleased)
|
|||
- Fix avatar stretching by providing a cropping feature (Johann Pardanaud)
|
||||
- Don't load all of GitLab in mail_room
|
||||
- Strip leading and trailing spaces in URL validator (evuez)
|
||||
- Add "last_sign_in_at" and "confirmed_at" to GET /users/* API endpoints for admins (evuez)
|
||||
- Return empty array instead of 404 when commit has no statuses in commit status API
|
||||
- Update documentation to reflect Guest role not being enforced on internal projects
|
||||
- Allow search for logged out users
|
||||
|
|
|
@ -151,6 +151,8 @@ Parameters:
|
|||
"name": "John Smith",
|
||||
"state": "active",
|
||||
"created_at": "2012-05-23T08:00:58Z",
|
||||
"confirmed_at": "2012-05-23T08:00:58Z",
|
||||
"last_sign_in_at": "2015-03-23T08:00:58Z",
|
||||
"bio": null,
|
||||
"skype": "",
|
||||
"linkedin": "",
|
||||
|
|
|
@ -23,6 +23,8 @@ module API
|
|||
end
|
||||
|
||||
class UserFull < User
|
||||
expose :last_sign_in_at
|
||||
expose :confirmed_at
|
||||
expose :email
|
||||
expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at
|
||||
expose :identities, using: Entities::Identity
|
||||
|
|
|
@ -47,6 +47,8 @@ describe API::API, api: true do
|
|||
expect(json_response.first.keys).to include 'identities'
|
||||
expect(json_response.first.keys).to include 'can_create_project'
|
||||
expect(json_response.first.keys).to include 'two_factor_enabled'
|
||||
expect(json_response.first.keys).to include 'last_sign_in_at'
|
||||
expect(json_response.first.keys).to include 'confirmed_at'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue