diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-21 11:45:46 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-21 12:25:12 +0100 |
| commit | 7fe7897c56046ade852def480d2cebe1be584512 (patch) | |
| tree | 6a20af771355b78a899d0ec969441c4002af25be | |
| parent | 416c25871dcf8680ccf1af5da91fe0004e59eb05 (diff) | |
| download | gitlab-ce-7fe7897c56046ade852def480d2cebe1be584512.tar.gz | |
Explain how to use AD userPrincipalName for logins
| -rw-r--r-- | config/gitlab.yml.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index f628ac9121f..cdab54faaf8 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -129,9 +129,12 @@ production: &base password: '_the_password_of_the_bind_user' # If allow_username_or_email_login is enabled, GitLab will ignore everything # after the first '@' in the LDAP 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'. + # + # Disable this setting if you are using "uid: 'userPrincipalName'" on ActiveDirectory. allow_username_or_email_login: true ## OmniAuth settings |