summaryrefslogtreecommitdiff
path: root/doc/api/users.md
diff options
context:
space:
mode:
authorCyril <jv.cyril@gmail.com>2012-12-10 23:46:31 +0100
committerCyril <jv.cyril@gmail.com>2012-12-12 18:51:20 +0100
commitd3b8952f8fb067afe89f08eadbae7733c0cc6824 (patch)
treeef0663a6e52d527045727c875d4c15fa0020778e /doc/api/users.md
parentb48852e78901e3ce3fdc6449c4dc67d01b30f0ca (diff)
downloadgitlab-ce-d3b8952f8fb067afe89f08eadbae7733c0cc6824.tar.gz
Add username to User and UserBasic entities in API and in examples in doc.
Diffstat (limited to 'doc/api/users.md')
-rw-r--r--doc/api/users.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index e5674ab8463..200c0e06e04 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -10,6 +10,7 @@ GET /users
[
{
"id": 1,
+ "username": "john_smith",
"email": "john@example.com",
"name": "John Smith",
"blocked": false,
@@ -23,6 +24,7 @@ GET /users
},
{
"id": 2,
+ "username": "jack_smith",
"email": "jack@example.com",
"name": "Jack Smith",
"blocked": false,
@@ -52,6 +54,7 @@ Parameters:
```json
{
"id": 1,
+ "username": "john_smith",
"email": "john@example.com",
"name": "John Smith",
"blocked": false,
@@ -75,6 +78,7 @@ POST /users
Parameters:
+ `email` (required) - Email
+ `password` (required) - Password
++ `username` (required) - Username
+ `name` (required) - Name
+ `skype` - Skype ID
+ `linkedin` - Linkedin
@@ -95,6 +99,7 @@ GET /user
```json
{
"id": 1,
+ "username": "john_smith",
"email": "john@example.com",
"name": "John Smith",
"blocked": false,