Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
55d086ba
Commit
55d086ba
authored
Apr 14, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify config var and add to LDAP docs.
parent
238e4f02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
config/gitlab.yml.example
config/gitlab.yml.example
+3
-1
doc/integration/ldap.md
doc/integration/ldap.md
+5
-0
No files found.
config/gitlab.yml.example
View file @
55d086ba
...
@@ -146,7 +146,9 @@ production: &base
...
@@ -146,7 +146,9 @@ production: &base
# disable this setting, because the userPrincipalName contains an '@'.
# disable this setting, because the userPrincipalName contains an '@'.
allow_username_or_email_login: false
allow_username_or_email_login: false
# Locks down those users until they have been cleared by the admin (default: false).
# To maintain tight control over the number of active users on your GitLab installation,
# enable this setting to keep new users blocked until they have been cleared by the admin
# (default: false).
block_auto_created_users: false
block_auto_created_users: false
# Base where we can search for users
# Base where we can search for users
...
...
doc/integration/ldap.md
View file @
55d086ba
...
@@ -51,6 +51,11 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
...
@@ -51,6 +51,11 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
# disable this setting, because the userPrincipalName contains an '@'.
# disable this setting, because the userPrincipalName contains an '@'.
allow_username_or_email_login: false
allow_username_or_email_login: false
# To maintain tight control over the number of active users on your GitLab installation,
# enable this setting to keep new users blocked until they have been cleared by the admin
# (default: false).
block_auto_created_users: false
# Base where we can search for users
# Base where we can search for users
#
#
# Ex. ou=People,dc=gitlab,dc=example
# Ex. ou=People,dc=gitlab,dc=example
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment