summaryrefslogtreecommitdiff
path: root/doc/api/users.md
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-14 13:56:06 -0800
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-14 13:56:06 -0800
commitd2be7577c12766618fd8f57c8328fd847cfa8264 (patch)
treec478316b61db57a21d257c9b6ffc87d0d31c7980 /doc/api/users.md
parent645afc384a12a06b7760fce1f0fdc822e9c6b164 (diff)
parenta5861b8ff34621be246ea0951a9e46b8859af4d4 (diff)
downloadgitlab-ce-d2be7577c12766618fd8f57c8328fd847cfa8264.tar.gz
Merge pull request #2243 from jouve/fix_gfm_username_autocomplete
fix gfm autocomplete for usernames
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,