Skip to content

G
gitlab-ce
Commit 1ee94423 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files
Options

Further explain userPrincipalName settings

parent 7fe7897c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
config/gitlab.yml.example
View file @ 1ee94423
...@@ -134,7 +134,8 @@ production: &base ...@@ -134,7 +134,8 @@ production: &base
# - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
# - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. # - 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 allow_username_or_email_login: true
## OmniAuth settings ## OmniAuth settings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7