diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-06-26 15:54:29 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:08 +0200 |
| commit | 766fa97b457fb2f9903f80aaec640cd1d08a1bbd (patch) | |
| tree | d38fe7fd5c7e7a34e541f2b5ba9f5b79e8f2d3a9 /actionpack | |
| parent | c48ce6e73d1f0765902779adab3242b5f4a893c6 (diff) | |
| download | rails-766fa97b457fb2f9903f80aaec640cd1d08a1bbd.tar.gz rails-766fa97b457fb2f9903f80aaec640cd1d08a1bbd.tar.bz2 rails-766fa97b457fb2f9903f80aaec640cd1d08a1bbd.zip | |
Hook up AV::Rendering on AV intialization
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index af5de815bb..8949a9fc78 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -163,6 +163,8 @@ module AbstractController method_for_action(action_name).present? end + ActiveSupport.run_load_hooks(:abstract_controller, self) + private # Returns true if the name can be considered an action because diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index e89542f9f9..f0e8945f11 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -2,8 +2,6 @@ module ActionController module Rendering extend ActiveSupport::Concern - include ActionView::Rendering - # Before processing, set the request formats in current controller formats. def process_action(*) #:nodoc: self.formats = request.formats.map(&:ref).compact |