diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-06-24 19:24:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-06-24 19:24:20 +0000 |
| commit | d2de219f6cf5d6ce371f529988f9337653878e58 (patch) | |
| tree | b37da0f9b071353cfaaf097804951f262a95be2d /doc | |
| parent | c465af093096990ee42b3021fce157d02b8864cb (diff) | |
| parent | 6548e9b48c079bb29cfe61eff99179e880583641 (diff) | |
| download | gitlab-ce-d2de219f6cf5d6ce371f529988f9337653878e58.tar.gz | |
Merge branch 'add-2fa-status-to-admin-api' into 'master'
Add 2FA status to user admin API
This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA.
See merge request !881
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/users.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index cd141daadc8..8b04282f160 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -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 } ] ``` |