diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:58:01 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:58:01 +0100 |
| commit | 53b285c9a8b7eec9ee10906ef519da376347b69e (patch) | |
| tree | e3fa4f337112cedb08343e7d3ea85ecc1f48fb1d /doc/integration/ldap.md | |
| parent | 2f048df4a4a83ff009d2ef2d14ee04e5a2798618 (diff) | |
| parent | 21a59b23fe4d8bc4331f746c75f9242a49d75faa (diff) | |
| download | gitlab-ce-53b285c9a8b7eec9ee10906ef519da376347b69e.tar.gz | |
Merge branch 'master' into merge-if-green
Diffstat (limited to 'doc/integration/ldap.md')
| -rw-r--r-- | doc/integration/ldap.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md index 9b7d8fa3969..7e2920b8865 100644 --- a/doc/integration/ldap.md +++ b/doc/integration/ldap.md @@ -71,7 +71,7 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server # Filter LDAP users # - # Format: RFC 4515 http://tools.ietf.org/search/rfc4515 + # Format: RFC 4515 https://tools.ietf.org/search/rfc4515 # Ex. (employeeType=developer) # # Note: GitLab does not support omniauth-ldap's custom filter syntax. @@ -145,7 +145,7 @@ If multiple LDAP email attributes are present, e.g. `mail: foo@bar.com` and `ema ## Using an LDAP filter to limit access to your GitLab server If you want to limit all GitLab access to a subset of the LDAP users on your LDAP server you can set up an LDAP user filter. -The filter must comply with [RFC 4515](http://tools.ietf.org/search/rfc4515). +The filter must comply with [RFC 4515](https://tools.ietf.org/search/rfc4515). ```ruby # For omnibus packages; new LDAP server syntax |