diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-06-26 13:40:46 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:07 +0200 |
| commit | 5759531a951ce495e2ac7dd8de79fa36ea798bac (patch) | |
| tree | 6ba2a0fca3a37bef9461b361ad46989e4780f567 /actionpack/lib/action_controller | |
| parent | e772b098edce2a4ac6a51edb6758e1ef08c4a176 (diff) | |
| download | rails-5759531a951ce495e2ac7dd8de79fa36ea798bac.tar.gz rails-5759531a951ce495e2ac7dd8de79fa36ea798bac.tar.bz2 rails-5759531a951ce495e2ac7dd8de79fa36ea798bac.zip | |
Move rendering from AP to AV
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index bea6b88f91..e89542f9f9 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -2,7 +2,7 @@ module ActionController module Rendering extend ActiveSupport::Concern - include AbstractController::Rendering + include ActionView::Rendering # Before processing, set the request formats in current controller formats. def process_action(*) #:nodoc: diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index 73e9b5660d..2c86d7136c 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -193,7 +193,7 @@ module ActionController #:nodoc: module Streaming extend ActiveSupport::Concern - include AbstractController::Rendering + include ActionView::Rendering protected |