diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 12:06:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 12:06:16 +0300 |
commit | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (patch) | |
tree | 2612572041a8a6121ce9098cabf8724e67a96ea2 /doc/administration | |
parent | 3209c1a49c14cab93eb347bfca59bace30879440 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/auth/ldap-ee.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index e2894318fe5..b1d4c8e4298 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -10,6 +10,9 @@ This section documents LDAP features specific to to GitLab Enterprise Edition For documentation relevant to both Community Edition and Enterprise Edition, see the main [LDAP documentation](ldap.md). +NOTE: **Note:** +[Microsoft Active Directory Trusts](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc771568(v=ws.10)) are not supported + ## Use cases - User sync: Once a day, GitLab will update users against LDAP. |