From 34b3567c97ecc0f317adae04e10e4d7d8c8830db Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 19 Nov 2019 09:06:16 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/administration/auth/ldap-ee.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/administration/auth') 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. -- cgit v1.2.3