summaryrefslogtreecommitdiff
path: root/doc/api/users.md
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-06-23 22:36:35 -0700
committerStan Hu <stanhu@gmail.com>2015-06-23 22:41:59 -0700
commit6548e9b48c079bb29cfe61eff99179e880583641 (patch)
treed189ff431a8b85f9e39c978f99e8fe3d87a97b43 /doc/api/users.md
parent764b5913c8f960d09d4777e3233662f507b0ec13 (diff)
downloadgitlab-ce-6548e9b48c079bb29cfe61eff99179e880583641.tar.gz
Add 2FA status to user admin API
Closes https://github.com/gitlabhq/gitlabhq/issues/9391
Diffstat (limited to 'doc/api/users.md')
-rw-r--r--doc/api/users.md6
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
}
]
```