diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-12-05 00:17:39 +0100 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-12-05 01:02:46 +0100 |
| commit | d8888b94b32b28003ec247d0565e73dee731275e (patch) | |
| tree | 410e0e71ad7ba0cddacb0d6128ccc3c8c9b77764 /actionview | |
| parent | 501acab943cdc3a5ac389cfd9b39dc34d3ca86fb (diff) | |
| download | rails-d8888b94b32b28003ec247d0565e73dee731275e.tar.gz rails-d8888b94b32b28003ec247d0565e73dee731275e.tar.bz2 rails-d8888b94b32b28003ec247d0565e73dee731275e.zip | |
Retain ActionPack dependency on ActionView
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/railtie.rb | 1 | ||||
| -rw-r--r-- | actionview/test/abstract_unit.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index c2783f6377..7db557ff83 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -38,7 +38,6 @@ 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 6623b47e83..eef0abb609 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -267,8 +267,6 @@ class Rack::TestCase < ActionDispatch::IntegrationTest end end -# Emulate AV railtie. -ActionController::Base.superclass.send(:include, ActionView::Layouts) ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) module ActionController |