Merge branch 'master' of github.com:gitlabhq/gitlabhq

364bd38d · Dmitriy Zaporozhets · 197a704f · 4fdafcaf · 364bd38d
Commit 364bd38d authored Jan 30, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/gitlab.yml.example config/gitlab.yml.example +1 -1

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -124,7 +124,7 @@ production: &base
    base: '_the_base_where_you_search_for_users'
    port: 636
    uid: 'sAMAccountName'
-    method: 'ssl' # "ssl" or "plain"
+    method: 'ssl' # "tls" or "ssl" or "plain"
    bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
    password: '_the_password_of_the_bind_user'
    # If allow_username_or_email_login is enabled, GitLab will ignore everything