OSDN Git Service
(root)
/
wvm
/
gitlab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7fe7897
)
Further explain userPrincipalName settings
author
Jacob Vosmaer
<contact@jacobvosmaer.nl>
Tue, 21 Jan 2014 12:33:29 +0000
(13:33 +0100)
committer
Jacob Vosmaer
<contact@jacobvosmaer.nl>
Tue, 21 Jan 2014 12:33:29 +0000
(13:33 +0100)
config/gitlab.yml.example
patch
|
blob
|
history
diff --git
a/config/gitlab.yml.example
b/config/gitlab.yml.example
index
cdab54f
..
3a46a0a
100644
(file)
--- a/
config/gitlab.yml.example
+++ b/
config/gitlab.yml.example
@@
-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