Commit 6548e9b4 authored by Stan Hu's avatar Stan Hu

Add 2FA status to user admin API

Closes https://github.com/gitlabhq/gitlabhq/issues/9391
parent 764b5913
Please view this file on the master branch, on stable branches it's out of date.
v 7.13.0 (unreleased)
- Add `two_factor_enabled` field to admin user API (Stan Hu)
- Fix invalid timestamps in RSS feeds (Rowan Wookey)
- Fix error when deleting a user who has projects (Stan Hu)
- Fix downloading of patches on public merge requests when user logged out (Stan Hu)
......
......@@ -58,7 +58,8 @@ GET /users
"is_admin": false,
"avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
"can_create_group": true,
"current_sign_in_at": "2014-03-19T13:12:15Z"
"current_sign_in_at": "2014-03-19T13:12:15Z",
"two_factor_enabled": true
},
{
"id": 2,
......@@ -81,7 +82,8 @@ GET /users
"can_create_group": true,
"can_create_project": true,
"projects_limit": 100,
"current_sign_in_at": "2014-03-19T17:54:13Z"
"current_sign_in_at": "2014-03-19T17:54:13Z",
"two_factor_enabled": false
}
]
```
......
......@@ -24,6 +24,7 @@ class UserFull < User
expose :identities, using: Entities::Identity
expose :can_create_group?, as: :can_create_group
expose :can_create_project?, as: :can_create_project
expose :two_factor_enabled
end
class UserLogin < UserFull
......
......@@ -35,6 +35,7 @@
expect(json_response.first.keys).to include 'email'
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'
end
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment