summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-01-17 11:34:06 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-01-17 11:34:06 +0100
commit390f0b76b51d966b2ac429c28d07fbec5497a4c0 (patch)
tree73286fb34b3071bb1041a9164f00cf9845963a1d /config
parentdba982403b7b894d2096ea61b89a247060eefe57 (diff)
downloadgitlab-ce-390f0b76b51d966b2ac429c28d07fbec5497a4c0.tar.gz
Explain allow_username_or_email_login LDAP setting
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 71d46d4a19d..845862fe7ae 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -127,6 +127,11 @@ production: &base
method: 'ssl' # "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
+ # after the first '@' in LDAP the username submitted by the user on login.
+ # Example:
+ # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
+ # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'.
allow_username_or_email_login: true
## OmniAuth settings