diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 00:09:02 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 00:09:02 +0000 |
| commit | 2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018 (patch) | |
| tree | fd6a1c298cb159656c72d622d5844fb55e191913 /doc/integration | |
| parent | 9083509f2f0e424b1d53cca4877d994d2050562b (diff) | |
| download | gitlab-ce-2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/bitbucket.md | 2 | ||||
| -rw-r--r-- | doc/integration/kerberos.md | 1 | ||||
| -rw-r--r-- | doc/integration/omniauth.md | 3 | ||||
| -rw-r--r-- | doc/integration/saml.md | 1 | ||||
| -rw-r--r-- | doc/integration/shibboleth.md | 1 |
5 files changed, 0 insertions, 8 deletions
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md index 7cead234709..7a1bdf0d65c 100644 --- a/doc/integration/bitbucket.md +++ b/doc/integration/bitbucket.md @@ -89,8 +89,6 @@ you to use. For Omnibus packages: ```ruby - gitlab_rails['omniauth_enabled'] = true - gitlab_rails['omniauth_providers'] = [ { "name" => "bitbucket", diff --git a/doc/integration/kerberos.md b/doc/integration/kerberos.md index 3998089a0e4..14f3bdae864 100644 --- a/doc/integration/kerberos.md +++ b/doc/integration/kerberos.md @@ -72,7 +72,6 @@ For source installations, make sure the `kerberos` gem group 1. Edit `/etc/gitlab/gitlab.rb`: ```ruby - gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_allow_single_sign_on'] = ['kerberos'] gitlab_rails['kerberos_enabled'] = true diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 286d06d52a8..c75a2a90c2a 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -80,9 +80,6 @@ To change these settings: and change: ```ruby - # Versions prior to 11.4 require this to be set to true - # gitlab_rails['omniauth_enabled'] = nil - # CAUTION! # This allows users to login without having a user account first. Define the allowed providers # using an array, e.g. ["saml", "twitter"], or as true/false to allow all providers or none. diff --git a/doc/integration/saml.md b/doc/integration/saml.md index 10319b83233..30ba390f5cd 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -37,7 +37,6 @@ in your SAML IdP: For Omnibus package: ```ruby - gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_allow_single_sign_on'] = ['saml'] gitlab_rails['omniauth_block_auto_created_users'] = false ``` diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md index 885a6fe59da..71ac6012ce6 100644 --- a/doc/integration/shibboleth.md +++ b/doc/integration/shibboleth.md @@ -71,7 +71,6 @@ The following changes are needed to enable Shibboleth: gitlab_rails['omniauth_allow_single_sign_on'] = true gitlab_rails['omniauth_block_auto_created_users'] = false - gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_providers'] = [ { "name" => "'shibboleth"', |