From 8078bd185fd9fce86cb5a8d9a6b6209e0c23ae44 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 1 Nov 2019 00:06:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab/auth/ldap/config.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/gitlab/auth/ldap/config.rb')

diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb
index eb1d0925c55..4bc0ceedae7 100644
--- a/lib/gitlab/auth/ldap/config.rb
+++ b/lib/gitlab/auth/ldap/config.rb
@@ -21,6 +21,14 @@ module Gitlab
           Gitlab.config.ldap.enabled
         end
 
+        def self.sign_in_enabled?
+          enabled? && !prevent_ldap_sign_in?
+        end
+
+        def self.prevent_ldap_sign_in?
+          Gitlab.config.ldap.prevent_ldap_sign_in
+        end
+
         def self.servers
           Gitlab.config.ldap['servers']&.values || []
         end
-- 
cgit v1.2.1