diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-13 13:39:54 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-13 13:39:54 +0200 |
| commit | a7e071e9822a9803e9d686484298170dade5beb5 (patch) | |
| tree | 8a5eeb176ffc582454bcb977d03f8478bc11af90 /app/controllers/sessions_controller.rb | |
| parent | a756fd1ff6a7112ae60b4e738fb70013a5657a47 (diff) | |
| download | gitlab-ce-a7e071e9822a9803e9d686484298170dade5beb5.tar.gz | |
Add refactoring for multiple LDAP server support
These changes are ported from EE to CE. Apply changes for app directory
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 1bdba75c5e7..e918f46bb3e 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -18,6 +18,10 @@ class SessionsController < Devise::SessionsController store_location_for(:redirect, redirect_path) end + if Gitlab.config.ldap.enabled + @ldap_servers = Gitlab.config.ldap.servers + end + super end |