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 /actionpack/lib | |
| parent | d6363aa1805bed920e404035aae7138421902d5d (diff) | |
| download | rails-3fd2e724770810b5d5e8941b2f3861c4e859c517.tar.gz rails-3fd2e724770810b5d5e8941b2f3861c4e859c517.tar.bz2 rails-3fd2e724770810b5d5e8941b2f3861c4e859c517.zip | |
Load AV::Layouts dynamicly via railties
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 2 |
2 files changed, 0 insertions, 3 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 |