summaryrefslogtreecommitdiff
path: root/doc/api/users.md
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-06 13:06:01 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-06 13:06:01 +0100
commitc0849101e6d79bed12c830986c7ff63b2e2f3d9e (patch)
tree23338ba74654a5cd8b75adc21921f5cd6621b459 /doc/api/users.md
parent097faeb481db2a4956b41049c041d55f5da4e2c1 (diff)
parent95b1adb3394851132ea7ecb3104e9a857bdad82f (diff)
downloadgitlab-ce-merge-when-build-succeeds-unchecked.tar.gz
Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked
Diffstat (limited to 'doc/api/users.md')
-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": ""
}
```