summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-08-31 13:59:52 +0300
committerValery Sizov <vsv2711@gmail.com>2015-09-02 12:42:01 +0300
commit3700e5a9607ba9980940a29d275e22034538473d (patch)
treee781dc06aba5c73b979295eb124b1ef68c1f20aa /app/controllers
parent6f19e8799e4c8233b01068bf6b5406b0ba1d1105 (diff)
downloadgitlab-ce-3700e5a9607ba9980940a29d275e22034538473d.tar.gz
Crowd integration
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/sessions_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 8389f07a3bd..cfa565cd03e 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -8,6 +8,8 @@ class SessionsController < Devise::SessionsController
def new
if Gitlab.config.ldap.enabled
@ldap_servers = Gitlab::LDAP::Config.servers
+ else
+ @ldap_servers = []
end
super