home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity

Further explain userPrincipalName settings

Browse Source
This commit is contained in:
Jacob Vosmaer
2014-01-21 13:33:29 +01:00
parent 7fe7897c56
commit 1ee9442323
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/gitlab.yml.example
+2 -1
View File
@@ -134,7 +134,8 @@ production: &base
# - 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.
# If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to
# disable this setting, because the userPrincipalName contains an '@'.
allow_username_or_email_login: true
## OmniAuth settings