Prevent redeclaration of LDAP strategy

2014-10-17 18:03:34 +02:00 · 2014-10-17 18:03:34 +02:00 · d1c3864778
parent bd9d9b6def
commit d1c3864778
1 changed files with 2 additions and 1 deletions
--- a/config/initializers/7_omniauth.rb
+++ b/config/initializers/7_omniauth.rb
@ -1,7 +1,8 @@
 if Gitlab::LDAP::Config.enabled?
  module OmniAuth::Strategies
    server = Gitlab.config.ldap.servers.values.first
-    const_set(server['provider_class'], Class.new(LDAP))
+    klass = server['provider_class']
+    const_set(klass, Class.new(LDAP)) unless klass == 'LDAP'
  end

  OmniauthCallbacksController.class_eval do