Commit 378bc0d1 authored by Stan Hu's avatar Stan Hu Committed by Filipa Lacerda

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
parent ce8fc1be
---
title: Only load Omniauth if enabled
merge_request: 20132
author:
type: fixed
......@@ -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
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