diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-18 21:46:48 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-18 21:46:48 +0000 |
| commit | 1d8f1d25b7306d786a42d0d1fd8c2f8c2c2a9571 (patch) | |
| tree | b84cb7114af9a4f5c30a8e19342a32e7ec18e42b /config/gitlab.yml.example | |
| parent | 6524fbeaba7c16ae8ca514c7540a1aa6e86f4129 (diff) | |
| parent | 873b0db220b92008ed833f0909ecab8861bf00e8 (diff) | |
| download | gitlab-ce-1d8f1d25b7306d786a42d0d1fd8c2f8c2c2a9571.tar.gz | |
Merge branch 'revert-2782' into 'master'
Revert "Merge branch 'saml-decoupling' into 'master'"
This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing
changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2782
See merge request !2878
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index b6954b3152b..faf05ecd466 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -288,22 +288,15 @@ production: &base # auto_sign_in_with_provider: saml # CAUTION! - # This allows users to login without having a user account first. Define the allowed - # providers using an array, e.g. ["saml", "twitter"] + # This allows users to login without having a user account first (default: false). # User accounts will be created automatically when authentication was successful. - allow_single_sign_on: ["saml"] - + allow_single_sign_on: false # Locks down those users until they have been cleared by the admin (default: true). block_auto_created_users: true # Look up new users in LDAP servers. If a match is found (same uid), automatically # link the omniauth identity with the LDAP account. (default: false) auto_link_ldap_user: false - # Allow users with existing accounts to login and auto link their account via SAML - # login, without having to do a manual login first and manually add SAML - # (default: false) - auto_link_saml_user: false - ## Auth providers # Uncomment the following lines and fill in the data of the auth provider you want to use # If your favorite auth provider is not listed you can use others: |