From fc5bfd1dc1c963d018d4de61b03c5ba28aafcd18 Mon Sep 17 00:00:00 2001 From: Jan-Willem van der Meer Date: Tue, 14 Oct 2014 09:22:59 +0200 Subject: [PATCH] Move dynamic omniauth declarations to initializer --- app/controllers/omniauth_callbacks_controller.rb | 4 ---- config/initializers/7_omniauth.rb | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 0f364a48ea2..f46b36568f3 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -32,10 +32,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController end end - Gitlab.config.ldap.servers.each do |server| - alias_method server.provider_name, :ldap - end - def omniauth_error @provider = params[:provider] @error = params[:error] diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb index 1f569dbe91c..22e2d740fdc 100644 --- a/config/initializers/7_omniauth.rb +++ b/config/initializers/7_omniauth.rb @@ -2,3 +2,8 @@ module OmniAuth::Strategies server = Gitlab.config.ldap.servers.first const_set(server.provider_class, Class.new(LDAP)) end + +OmniauthCallbacksController.class_eval do + server = Gitlab.config.ldap.servers.first + alias_method server.provider_name, :ldap +end \ No newline at end of file