From 6c7d895ddae5a7a696a9a047e025e9e4e305f790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?= Date: Tue, 30 Jul 2013 00:34:19 +0200 Subject: Do not load AV inside AP Move that part to AV railtie --- actionview/lib/action_view/railtie.rb | 1 + actionview/test/abstract_unit.rb | 1 + 2 files changed, 2 insertions(+) (limited to 'actionview') diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index 8382023e06..4113448af0 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -39,6 +39,7 @@ module ActionView initializer "action_view.setup_action_pack", before: :add_view_paths do |app| ActiveSupport.on_load(:action_controller) do ActionController::Base.superclass.send(:include, ActionView::Layouts) + ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) end end diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index e4d0b53b59..6623b47e83 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -269,6 +269,7 @@ end # Emulate AV railtie. ActionController::Base.superclass.send(:include, ActionView::Layouts) +ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) module ActionController class Base -- cgit v1.2.3