diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-09-13 14:40:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-09-13 14:40:08 +0000 |
| commit | ff5d8b635f234241441009e41af7b61f5804b2c2 (patch) | |
| tree | 0b79c2a20d2b7e685c58e5accd8734f3e92aa5c4 /config | |
| parent | c4009e643d3f7297d4eb53477ee7b71e25ac01bd (diff) | |
| parent | b4dc492123a88860a944d50bbe30ac9966b5e4b6 (diff) | |
| download | gitlab-ce-ff5d8b635f234241441009e41af7b61f5804b2c2.tar.gz | |
Merge branch '49990-enable-omniauth-by-default' into 'master'
Enable omniauth by default
Closes #49990
See merge request gitlab-org/gitlab-ce!21700
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e9129e20a61..fdaf6a6472d 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -447,7 +447,7 @@ production: &base ## OmniAuth settings omniauth: # Allow login via Twitter, Google, etc. using OmniAuth providers - enabled: false + # enabled: true # Uncomment this to automatically sign in with a specific omniauth provider's without # showing GitLab's sign-in page (default: show the GitLab sign-in page) @@ -795,7 +795,7 @@ test: project_key: PROJECT omniauth: - enabled: true + # enabled: true allow_single_sign_on: true external_providers: [] diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 67f0f2b4169..0caa4962128 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -45,7 +45,7 @@ if Settings.ldap['enabled'] || Rails.env.test? end Settings['omniauth'] ||= Settingslogic.new({}) -Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil? +Settings.omniauth['enabled'] = true if Settings.omniauth['enabled'].nil? Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil? Settings.omniauth['allow_single_sign_on'] = false if Settings.omniauth['allow_single_sign_on'].nil? Settings.omniauth['external_providers'] = [] if Settings.omniauth['external_providers'].nil? |