Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-07-02 11:46:24 +0300
committerLin Jen-Shin <godfat@godfat.org>2018-07-02 11:46:24 +0300
commit3b8b38fb0f6e8e6f73ac39c96a9338c5fc875f6f (patch)
treea8598ee32076663964f66463425dafe2ee1f464d /lib/gitlab/omniauth_initializer.rb
parent17a38b5a8b722db6f7ebf1c6eb801c63ad371880 (diff)
If `omniauth_auto_sign_in_with_provider` is set,
it also means we're using omniauth, so we need to set it up.
Diffstat (limited to 'lib/gitlab/omniauth_initializer.rb')
-rw-r--r--lib/gitlab/omniauth_initializer.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/omniauth_initializer.rb b/lib/gitlab/omniauth_initializer.rb
index 35ed3a5ac05..a71acda8701 100644
--- a/lib/gitlab/omniauth_initializer.rb
+++ b/lib/gitlab/omniauth_initializer.rb
@@ -1,5 +1,10 @@
module Gitlab
class OmniauthInitializer
+ def self.enabled?
+ Gitlab.config.omniauth.enabled ||
+ Gitlab.config.omniauth.auto_sign_in_with_provider.present?
+ end
+
def initialize(devise_config)
@devise_config = devise_config
end