diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-25 18:38:18 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-25 18:38:18 +0300 |
| commit | 18565188a938f62d09c8c2809593d2cd4efa3ad7 (patch) | |
| tree | 1b976f13614111e02aa64302a01a7c18edae0f56 /config | |
| parent | e69760b652a7956ad9f8e8e0bf52ef2d0b90df50 (diff) | |
| parent | ed5e61625a4aace6804a374fc69cbcc487cf5b49 (diff) | |
Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'
Don't try to load omniauth if not enabled
Closes gitlab-ee#6591
See merge request gitlab-org/gitlab-ce!20132
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 362b9cc9a88..d051b699102 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -219,5 +219,7 @@ Devise.setup do |config| end end - Gitlab::OmniauthInitializer.new(config).execute(Gitlab.config.omniauth.providers) + if Gitlab.config.omniauth.enabled + Gitlab::OmniauthInitializer.new(config).execute(Gitlab.config.omniauth.providers) + end end |