Merge branch 'patch-24' into 'master'

docs: clarify LDAP cache time

See merge request gitlab-org/gitlab-ce!22095
This commit is contained in:
Drew Blessing 2019-05-07 16:57:45 +00:00
commit 426e8c6806
1 changed files with 2 additions and 2 deletions

View File

@ -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.