From dd36324756b6b3027444db545bc1875f5d2d4b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 8 Sep 2011 08:20:37 +0200 Subject: [PATCH] No need to finalize Devise helpers all the time, closes #1317 --- lib/devise/rails/routes.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/devise/rails/routes.rb b/lib/devise/rails/routes.rb index 17199ee7..8b84258a 100644 --- a/lib/devise/rails/routes.rb +++ b/lib/devise/rails/routes.rb @@ -4,8 +4,12 @@ module ActionDispatch::Routing # need devise_for mappings already declared to create filters and helpers. def finalize_with_devise! finalize_without_devise! - Devise.configure_warden! - Devise.regenerate_helpers! + + @devise_finalized ||= begin + Devise.configure_warden! + Devise.regenerate_helpers! + true + end end alias_method_chain :finalize!, :devise end @@ -169,6 +173,7 @@ module ActionDispatch::Routing # end # def devise_for(*resources) + @devise_finalized = false options = resources.extract_options! options[:as] ||= @scope[:as] if @scope[:as].present?