diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-07-16 15:25:25 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:10 +0200 |
| commit | 3fd2e724770810b5d5e8941b2f3861c4e859c517 (patch) | |
| tree | 51da3490f82cbabcb78fa8b61ddb276608883d84 | |
| parent | d6363aa1805bed920e404035aae7138421902d5d (diff) | |
| download | rails-3fd2e724770810b5d5e8941b2f3861c4e859c517.tar.gz rails-3fd2e724770810b5d5e8941b2f3861c4e859c517.tar.bz2 rails-3fd2e724770810b5d5e8941b2f3861c4e859c517.zip | |
Load AV::Layouts dynamicly via railties
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/railtie.rb | 2 | ||||
| -rw-r--r-- | actionview/test/abstract_unit.rb | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 80b5f118ff..ff0a7bf6ce 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -210,7 +210,6 @@ module ActionController end MODULES = [ - ActionView::Layouts, AbstractController::Translation, AbstractController::AssetPaths, diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index 2c86d7136c..b017415486 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -193,8 +193,6 @@ module ActionController #:nodoc: module Streaming extend ActiveSupport::Concern - include ActionView::Rendering - protected # Set proper cache control and transfer encoding when streaming diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 49dd891e4c..5b2264de14 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -268,6 +268,8 @@ class Rack::TestCase < ActionDispatch::IntegrationTest end end +ActionController::Base.superclass.send(:include, ActionView::Layouts) + module ActionController class Base include ActionController::Testing diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index e94f71ae74..d05c2e4c67 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -38,7 +38,7 @@ module ActionView initializer "action_view.setup_action_pack" do |app| ActiveSupport.on_load(:action_controller) do - ActionController::Base.send(:include, ActionView::Layouts) + ActionController::Base.superclass.send(:include, ActionView::Layouts) end end end diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 8213997f4e..dc1b29482b 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -268,6 +268,8 @@ class Rack::TestCase < ActionDispatch::IntegrationTest end end +ActionController::Base.superclass.send(:include, ActionView::Layouts) + module ActionController class Base include ActionController::Testing |