Commit 9b53b20a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ad-block-doc' into 'master'

Imporove LDAP documentation

If user was blocked in Active Directory - user will be automatically blocked in GitLab during next Daily sync.
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes gitlab/gitlabhq#2126 as part of gitlab/gitlab-ee#248 (https://dev.gitlab.org/gitlab/gitlab-ee/issues/248#note_40033)

cc @haydn @marin

See merge request !420
parents 7bf9dcaf 896eb0aa
......@@ -313,6 +313,12 @@ But because he is no longer active on the GitLab EE server (he cannot log in!),
> Now with GitLab 7.5 Enterprise Edition, within 24 hours of John being removed from the LDAP server, his user will also stop being listed as member of any GitLab groups.
### Blocked users and Daily sync
If you use Active directory and you block user in AD - user will be automatically blocked in GitLab during next LDAP Sync.
## LDAP Synchronization
LDAP membership is checked for a GitLab user:
......
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