summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-06 13:06:25 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-06 13:06:25 +0100
commit639d428046938b5976f87726746d862441ee7036 (patch)
treed5db554d7efec312ccc6b7994f7dfb5d9ed23bf4 /doc
parent384445eca6249363c0da6d8b96e7ee030dc6fab3 (diff)
parent95b1adb3394851132ea7ecb3104e9a857bdad82f (diff)
downloadgitlab-ce-more-opengraph.tar.gz
Merge branch 'master' into more-opengraphmore-opengraph
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": ""
}
```