Commit 426e8c68 authored by Drew Blessing's avatar Drew Blessing

Merge branch 'patch-24' into 'master'

docs: clarify LDAP cache time

See merge request gitlab-org/gitlab-ce!22095
parents 5609523a 42715bef
......@@ -30,9 +30,9 @@ the LDAP server.
### User deletion
If a user is deleted from the LDAP server, they will be blocked in GitLab, as
If a user is deleted from the LDAP server, they will be blocked in GitLab as
well. Users will be immediately blocked from logging in. However, there is an
LDAP check cache time (sync time) of one hour (see note). This means users that
LDAP check cache time of one hour (see note) which means users that
are already logged in or are using Git over SSH will still be able to access
GitLab for up to one hour. Manually block the user in the GitLab Admin area to
immediately block all access.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment