summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-07-26 11:57:05 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-08-24 17:33:53 +0200
commitf8865e9c1303be7302306bea9dd1057bf3b3f608 (patch)
tree6dadf2a46c163a43c2acc2e3521657e65386dedf /config
parent88892e43adecd68de7940fdc9856a4557098cb6c (diff)
downloadgitlab-ce-f8865e9c1303be7302306bea9dd1057bf3b3f608.tar.gz
Define ldap methods at runtime
This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
Diffstat (limited to 'config')
-rw-r--r--config/initializers/omniauth.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 56c279ffcf4..fddb018e948 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -6,12 +6,6 @@ if Gitlab::LDAP::Config.enabled?
const_set(server['provider_class'], Class.new(LDAP))
end
end
-
- OmniauthCallbacksController.class_eval do
- Gitlab::LDAP::Config.available_servers.each do |server|
- alias_method server['provider_name'], :ldap
- end
- end
end
OmniAuth.config.full_host = Settings.gitlab['base_url']