summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-12 08:23:20 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-12 08:23:20 +0300
commitfa4150d47d88b85d6027729844480a3e7c71d3cd (patch)
treef26b16e9cf4ed15686cb2843758c782192ec3ade /config/gitlab.yml.example
parent486de8c3f412df3e71c9045faf250941c03c8c00 (diff)
downloadgitlab-ce-fa4150d47d88b85d6027729844480a3e7c71d3cd.tar.gz
Cleanup after omniauth
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index a52bc1b9e51..3e4668ceffb 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -43,8 +43,6 @@ ldap:
omniauth:
enabled: false
- allow_single_sign_on: false
- block_auto_created_users: true
providers:
# - { name: 'google_oauth2', app_id: 'YOUR APP ID',
# app_secret: 'YOUR APP SECRET',
@@ -53,6 +51,10 @@ omniauth:
# app_secret: 'YOUR APP SECRET'}
# - { name: 'github', app_id: 'YOUR APP ID',
# app_secret: 'YOUR APP SECRET' }
+ # IMPORTANT!
+ # It allows user to login without having user account
+ allow_single_sign_on: false
+ block_auto_created_users: true
#