summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 00:06:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 00:06:02 +0000
commit8078bd185fd9fce86cb5a8d9a6b6209e0c23ae44 (patch)
tree6bce184b45888ebeacc7060c84b892ecbd67a4ca /config/gitlab.yml.example
parent8f210aebe1d740e8ee194f171f1f33a6e1fba313 (diff)
downloadgitlab-ce-8078bd185fd9fce86cb5a8d9a6b6209e0c23ae44.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 02d66067418..94fd71aaa33 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -494,6 +494,7 @@ production: &base
# bundle exec rake gitlab:ldap:check RAILS_ENV=production
ldap:
enabled: false
+ prevent_ldap_sign_in: false
# This setting controls the number of seconds between LDAP permission checks
# for each user. After this time has expired for a given user, their next