diff options
Diffstat (limited to 'actionpack/lib/action_controller')
| -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 |