diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
| commit | c8db25c37c0d78457d06117497ccde7ad80e2321 (patch) | |
| tree | dc2db4637c33c53b032a22f8e78975838396ed13 /doc/integration/ldap.md | |
| parent | 6b9c730e91962a6d6343bcb7fc4dc75c99b41bde (diff) | |
| parent | 948bb655f3cba9909b7396c3062da7b22f4409b3 (diff) | |
| download | gitlab-ce-c8db25c37c0d78457d06117497ccde7ad80e2321.tar.gz | |
Merge branch 'master' into issue_3945
Diffstat (limited to 'doc/integration/ldap.md')
| -rw-r--r-- | doc/integration/ldap.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md index 845f588f913..f256477196b 100644 --- a/doc/integration/ldap.md +++ b/doc/integration/ldap.md @@ -48,6 +48,11 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' password: '_the_password_of_the_bind_user' + # Set a timeout, in seconds, for LDAP queries. This helps avoid blocking + # a request if the LDAP server becomes unresponsive. + # A value of 0 means there is no timeout. + timeout: 10 + # This setting specifies if LDAP server is Active Directory LDAP server. # For non AD servers it skips the AD specific queries. # If your LDAP server is not AD, set this to false. |