diff options
| author | Drew Blessing <drew@blessing.io> | 2019-05-07 16:57:45 +0000 |
|---|---|---|
| committer | Drew Blessing <drew@blessing.io> | 2019-05-07 16:57:45 +0000 |
| commit | 426e8c68060e8744ca52543139084666127eb445 (patch) | |
| tree | 8181a4ad02b97910ff898c535493b4d770f702fd | |
| parent | 5609523a6b877aca658c6bcc5906c3eddfae1213 (diff) | |
| parent | 42715beff73e27c8f9e24b3d0bc840c7c5eac4af (diff) | |
| download | gitlab-ce-426e8c68060e8744ca52543139084666127eb445.tar.gz | |
Merge branch 'patch-24' into 'master'
docs: clarify LDAP cache time
See merge request gitlab-org/gitlab-ce!22095
| -rw-r--r-- | doc/administration/auth/ldap.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index 423a79c56d8..54279897e04 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -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. |