diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-06 13:06:48 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-06 13:06:48 +0300 |
| commit | b0fa01fce3822da94aee6264829841996beb6df3 (patch) | |
| tree | f4a317c05d8536368da398ae495ab7506b5b649c /config | |
| parent | afb3caac797f5c90af9ff4989a3730299d39e3f1 (diff) | |
| parent | 772be582d1aad0481b67ad552703035ce7dd1fd8 (diff) | |
Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'
Resolve "Undefined omniauth_authorize_path when omniauth_enabled not enabled"
Closes #48677
See merge request gitlab-org/gitlab-ce!20302
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 2 | ||||
| -rw-r--r-- | config/initializers/omniauth.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index d051b699102..e5772c33307 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -219,7 +219,7 @@ Devise.setup do |config| end end - if Gitlab.config.omniauth.enabled + if Gitlab::OmniauthInitializer.enabled? Gitlab::OmniauthInitializer.new(config).execute(Gitlab.config.omniauth.providers) end end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index a7fa926a853..c558eb28ced 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -17,7 +17,7 @@ OmniAuth.config.before_request_phase do |env| Gitlab::RequestForgeryProtection.call(env) end -if Gitlab.config.omniauth.enabled +if Gitlab::OmniauthInitializer.enabled? provider_names = Gitlab.config.omniauth.providers.map(&:name) Gitlab::Auth.omniauth_setup_providers(provider_names) end |