summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-06 10:51:17 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-06 10:51:17 +0100
commit797c2326c386437bbae711cf0ba9bc4eb6395492 (patch)
tree2cb1f14952105a35928a9a972ec61970653a3422 /doc
parentdec42e42013def7c948feafce2c866fa5c3413df (diff)
parent8393e3e04b8b336ec80cb0da49d273f709043120 (diff)
downloadgitlab-ce-797c2326c386437bbae711cf0ba9bc4eb6395492.tar.gz
Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce
Diffstat (limited to 'doc')
-rw-r--r--doc/api/users.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index 66d2fd52526..773fe36d277 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -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": ""
}
```