diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-07-30 00:34:19 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:12 +0200 |
| commit | 6c7d895ddae5a7a696a9a047e025e9e4e305f790 (patch) | |
| tree | 2e8453c339d9c1f9cd06a96c2e57189af8d0a1ee /actionview | |
| parent | 9e6a1439d1a0ad7f7098f1eca0bb8f6fa9482c48 (diff) | |
| download | rails-6c7d895ddae5a7a696a9a047e025e9e4e305f790.tar.gz rails-6c7d895ddae5a7a696a9a047e025e9e4e305f790.tar.bz2 rails-6c7d895ddae5a7a696a9a047e025e9e4e305f790.zip | |
Do not load AV inside AP
Move that part to AV railtie
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/railtie.rb | 1 | ||||
| -rw-r--r-- | actionview/test/abstract_unit.rb | 1 |
2 files changed, 2 insertions, 0 deletions
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 |