diff options
| author | Sean Packham <seanpackham@gitlab.com> | 2016-09-27 15:42:35 +0100 |
|---|---|---|
| committer | Sean Packham <seanpackham@gitlab.com> | 2016-09-27 15:42:35 +0100 |
| commit | 1aad8f2f0f68f7ba1811a3fff48b181af85f752d (patch) | |
| tree | a8d45620ef22fa4a553de813254add25a998ee8c /doc | |
| parent | 0ef54d504c90146ffdbff5c699a40c689127b369 (diff) | |
| parent | 7b42ff6306bccc63a70f6731ce92974ec0a5e12b (diff) | |
| download | gitlab-ce-1aad8f2f0f68f7ba1811a3fff48b181af85f752d.tar.gz | |
Merge branch 'master' into add-university-content
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/users.md | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 54f7a2a2ace..9be4f2e6ec3 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -57,6 +57,7 @@ GET /users "linkedin": "", "twitter": "", "website_url": "", + "organization": "", "last_sign_in_at": "2012-06-01T11:41:01Z", "confirmed_at": "2012-05-23T09:05:22Z", "theme_id": 1, @@ -89,6 +90,7 @@ GET /users "linkedin": "", "twitter": "", "website_url": "", + "organization": "", "last_sign_in_at": null, "confirmed_at": "2012-05-30T16:53:06.148Z", "theme_id": 1, @@ -147,7 +149,8 @@ Parameters: "skype": "", "linkedin": "", "twitter": "", - "website_url": "" + "website_url": "", + "organization": "" } ``` @@ -178,6 +181,7 @@ Parameters: "linkedin": "", "twitter": "", "website_url": "", + "organization": "", "last_sign_in_at": "2012-06-01T11:41:01Z", "confirmed_at": "2012-05-23T09:05:22Z", "theme_id": 1, @@ -214,6 +218,7 @@ Parameters: - `linkedin` (optional) - LinkedIn - `twitter` (optional) - Twitter account - `website_url` (optional) - Website URL +- `organization` (optional) - Organization name - `projects_limit` (optional) - Number of projects user can create - `extern_uid` (optional) - External UID - `provider` (optional) - External provider name @@ -242,6 +247,7 @@ Parameters: - `linkedin` - LinkedIn - `twitter` - Twitter account - `website_url` - Website URL +- `organization` - Organization name - `projects_limit` - Limit projects each user can create - `extern_uid` - External UID - `provider` - External provider name @@ -296,6 +302,7 @@ GET /user "linkedin": "", "twitter": "", "website_url": "", + "organization": "", "last_sign_in_at": "2012-06-01T11:41:01Z", "confirmed_at": "2012-05-23T09:05:22Z", "theme_id": 1, |