Commit bbe079a6 authored by Ben Bodenmiller's avatar Ben Bodenmiller Committed by Evan Read

Remove extra gitlab_rails['omniauth_enabled'] flags

parent 5e532c2c
...@@ -89,8 +89,6 @@ you to use. ...@@ -89,8 +89,6 @@ you to use.
For Omnibus packages: For Omnibus packages:
```ruby ```ruby
gitlab_rails['omniauth_enabled'] = true
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
{ {
"name" => "bitbucket", "name" => "bitbucket",
......
...@@ -72,7 +72,6 @@ For source installations, make sure the `kerberos` gem group ...@@ -72,7 +72,6 @@ For source installations, make sure the `kerberos` gem group
1. Edit `/etc/gitlab/gitlab.rb`: 1. Edit `/etc/gitlab/gitlab.rb`:
```ruby ```ruby
gitlab_rails['omniauth_enabled'] = true
gitlab_rails['omniauth_allow_single_sign_on'] = ['kerberos'] gitlab_rails['omniauth_allow_single_sign_on'] = ['kerberos']
gitlab_rails['kerberos_enabled'] = true gitlab_rails['kerberos_enabled'] = true
......
...@@ -80,9 +80,6 @@ To change these settings: ...@@ -80,9 +80,6 @@ To change these settings:
and change: and change:
```ruby ```ruby
# Versions prior to 11.4 require this to be set to true
# gitlab_rails['omniauth_enabled'] = nil
# CAUTION! # CAUTION!
# This allows users to login without having a user account first. Define the allowed providers # 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. # using an array, e.g. ["saml", "twitter"], or as true/false to allow all providers or none.
......
...@@ -37,7 +37,6 @@ in your SAML IdP: ...@@ -37,7 +37,6 @@ in your SAML IdP:
For Omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_enabled'] = true
gitlab_rails['omniauth_allow_single_sign_on'] = ['saml'] gitlab_rails['omniauth_allow_single_sign_on'] = ['saml']
gitlab_rails['omniauth_block_auto_created_users'] = false gitlab_rails['omniauth_block_auto_created_users'] = false
``` ```
......
...@@ -71,7 +71,6 @@ The following changes are needed to enable Shibboleth: ...@@ -71,7 +71,6 @@ The following changes are needed to enable Shibboleth:
gitlab_rails['omniauth_allow_single_sign_on'] = true gitlab_rails['omniauth_allow_single_sign_on'] = true
gitlab_rails['omniauth_block_auto_created_users'] = false gitlab_rails['omniauth_block_auto_created_users'] = false
gitlab_rails['omniauth_enabled'] = true
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
{ {
"name" => "'shibboleth"', "name" => "'shibboleth"',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment