summaryrefslogtreecommitdiff
path: root/doc/api/users.md
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2015-12-30 16:52:02 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2016-01-08 16:26:04 -0200
commit6e7db8e23e169bcbf0847ece27b9e44e00ae572b (patch)
tree8b02d35437afb2f7a9d14f82edc9f8573062b273 /doc/api/users.md
parentba9855d4877998e3574907cc542fcab15a9d1353 (diff)
downloadgitlab-ce-6e7db8e23e169bcbf0847ece27b9e44e00ae572b.tar.gz
Prevent ldap_blocked users from being blocked/unblocked by the API
Diffstat (limited to 'doc/api/users.md')
-rw-r--r--doc/api/users.md6
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.