Merge branch 'patch-28' into 'master'
Fix LDAP config key name See merge request gitlab-org/gitlab-ce!14739
This commit is contained in:
commit
2ef28db9a1
1 changed files with 2 additions and 2 deletions
|
@ -287,11 +287,11 @@ LDAP email address, and then sign into GitLab via their LDAP credentials.
|
||||||
|
|
||||||
There are two encryption methods, `simple_tls` and `start_tls`.
|
There are two encryption methods, `simple_tls` and `start_tls`.
|
||||||
|
|
||||||
For either encryption method, if setting `validate_certificates: false`, TLS
|
For either encryption method, if setting `verify_certificates: false`, TLS
|
||||||
encryption is established with the LDAP server before any LDAP-protocol data is
|
encryption is established with the LDAP server before any LDAP-protocol data is
|
||||||
exchanged but no validation of the LDAP server's SSL certificate is performed.
|
exchanged but no validation of the LDAP server's SSL certificate is performed.
|
||||||
|
|
||||||
>**Note**: Before GitLab 9.5, `validate_certificates: false` is the default if
|
>**Note**: Before GitLab 9.5, `verify_certificates: false` is the default if
|
||||||
unspecified.
|
unspecified.
|
||||||
|
|
||||||
## Limitations
|
## Limitations
|
||||||
|
|
Loading…
Reference in a new issue