diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-14 12:04:28 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-14 12:04:28 +0100 |
| commit | 0014f19327f565d09d248eeabf6e50ebb85dcb47 (patch) | |
| tree | 27355d0db23d2507b37811e8f074c72d696ce5be /doc/api | |
| parent | eee16ca9ccd34ff950b685f4db57518207055a36 (diff) | |
| parent | 4d64a32c88dd5f87621d391c0f10f6acef094073 (diff) | |
| download | gitlab-ce-0014f19327f565d09d248eeabf6e50ebb85dcb47.tar.gz | |
Merge branch 'master' into ci/api-variables
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/users.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 773fe36d277..b7fc903825e 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -558,7 +558,8 @@ Parameters: - `uid` (required) - id of specified user -Will return `200 OK` on success, or `404 User Not Found` is user cannot be found. +Will return `200 OK` on success, `404 User Not Found` is user cannot be found or +`403 Forbidden` when trying to block an already blocked user by LDAP synchronization. ## Unblock user @@ -572,4 +573,5 @@ Parameters: - `uid` (required) - id of specified user -Will return `200 OK` on success, or `404 User Not Found` is user cannot be found. +Will return `200 OK` on success, `404 User Not Found` is user cannot be found or +`403 Forbidden` when trying to unblock a user blocked by LDAP synchronization. |