summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Koller <markus-koller@gmx.ch>2016-12-20 19:51:58 +0100
committerMarkus Koller <markus-koller@gmx.ch>2016-12-20 19:51:58 +0100
commit9bdbf841893e0540e1463b5440d8f032c7b6e8b5 (patch)
tree9b532b560aa3cf2dba6b183a1768cfa171111c3a
parente87e28059826fe0126e737ef3fea38bb34d44a78 (diff)
downloadgitlab-ce-9bdbf841893e0540e1463b5440d8f032c7b6e8b5.tar.gz
fixup! Log messages when blocking/unblocking LDAP accounts
-rw-r--r--doc/administration/auth/ldap.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index f14d2f44dd4..04723365277 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -298,8 +298,11 @@ LDAP server please double-check the LDAP `port` and `method` settings used by
GitLab. Common combinations are `method: 'plain'` and `port: 389`, OR
`method: 'ssl'` and `port: 636`.
-### Login with valid credentials rejected
+### Troubleshooting
-If there is an unexpected error while authenticating the user with the LDAP
-backend, the login is rejected and details about the error are logged to
-`application.log`.
+If a user account is blocked or unblocked due to the LDAP configuration, a
+message will be logged to `application.log`.
+
+If there is an unexpected error during an LDAP lookup (configuration error,
+timeout), the login is rejected and a message will be logged to
+`production.log`.