diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 10:37:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 10:37:22 +0000 |
| commit | 3fe578a7fdaea8607cf98ffb1878c03fd5ac3649 (patch) | |
| tree | e92606155c712290e457d737d071f862f6010d5c | |
| parent | f0d2d28118354b6362988687757b63dc7be611e5 (diff) | |
| parent | 390f0b76b51d966b2ac429c28d07fbec5497a4c0 (diff) | |
| download | gitlab-ce-3fe578a7fdaea8607cf98ffb1878c03fd5ac3649.tar.gz | |
Merge branch 'explain_allow_username_or_email_login' into 'master'
Explain allow_username_or_email_login LDAP setting
| -rw-r--r-- | config/gitlab.yml.example | 5 |
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 |