summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-06-25 16:17:06 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-06-25 16:17:06 +0800
commite62459809e6d0c18a41be962d228341e884dff9a (patch)
tree969ed2f0acb3b939a64858f8cb29000d7d228917
parentea1c5d5809c0baca21978ad10d4675a05b6ef116 (diff)
downloadgitlab-ce-e62459809e6d0c18a41be962d228341e884dff9a.tar.gz
Don't try to load omniauth if not enabled
-rw-r--r--config/initializers/devise.rb4
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