summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@blessing.io>2016-11-28 23:45:41 +0000
committerDrew Blessing <drew@blessing.io>2016-11-28 23:45:41 +0000
commitec5d0472288cac599d76a27870804e86fe29ffaf (patch)
treea2d5f4927f55646e57b960297c9a30a76ca10623
parentf5b272ca296a9022aa66b3ed383ded7edbd9d7e5 (diff)
parentcb9475259dfdbd28c6297d518b9263feb0711b93 (diff)
downloadgitlab-ce-ec5d0472288cac599d76a27870804e86fe29ffaf.tar.gz
Merge branch 'ldap_user_filter_update2' into 'master' [ci skip]
Remove `memberOf` OID in LDAP `user_filter` docs While not technically invalid, it is not necessary to have the `memberOf` OID in the `user_filter`. It clutters things up and causes confusion for users so it's better if we remove it from the docs. See merge request !7809
-rw-r--r--doc/administration/auth/ldap.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index d3f216fb3bf..b8b63df091e 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -221,7 +221,7 @@ Tip: If you want to limit access to the nested members of an Active Directory
group you can use the following syntax:
```
-(memberOf:1.2.840.113556.1.4.1941:=CN=My Group,DC=Example,DC=com)
+(memberOf=CN=My Group,DC=Example,DC=com)
```
Please note that GitLab does not support the custom filter syntax used by