diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-17 18:03:34 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 16:38:07 +0300 |
| commit | 49bd9812000626af71c1b7b00d9f998fcaca2a46 (patch) | |
| tree | 009bad39e65de38d82dc77c60aadea9ace4172dd | |
| parent | 644fd232dbe827aaae46068119345c2344495239 (diff) | |
| download | gitlab-ce-49bd9812000626af71c1b7b00d9f998fcaca2a46.tar.gz | |
Prevent redeclaration of LDAP strategy
| -rw-r--r-- | config/initializers/7_omniauth.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb index b8ac87fbd5a..18759f0cfb0 100644 --- 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 |