From 3b8b38fb0f6e8e6f73ac39c96a9338c5fc875f6f Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Mon, 2 Jul 2018 16:46:24 +0800
Subject: If `omniauth_auto_sign_in_with_provider` is set,

it also means we're using omniauth, so we need to set it up.
---
 lib/gitlab/omniauth_initializer.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

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
-- 
cgit v1.2.1