diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-01-14 14:23:42 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-01-14 14:23:42 +0100 |
| commit | 1b08cd811abeed18c3601e1b997b0566a243662c (patch) | |
| tree | 1b8f624b29bd2ae77d9344e31a3afe99f7b14536 /doc/api/users.md | |
| parent | c31d777c8f24029d7e11dd1e78eddf0c0b6e6f01 (diff) | |
| parent | e47f0e563d127f593f16c0a521c836e21bceb77f (diff) | |
| download | gitlab-ce-1b08cd811abeed18c3601e1b997b0566a243662c.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into add-pagination-headers-to-api
Diffstat (limited to 'doc/api/users.md')
| -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. |