diff options
| author | Yehuda Katz <wycats@yehuda-katz.home> | 2009-12-20 18:50:47 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@yehuda-katz.home> | 2009-12-20 18:50:54 -0800 |
| commit | 17f66473bce0decb2e5ff23142d4046056ccca1b (patch) | |
| tree | 3e40db99f5f0aa5f216697b768da364706c33d83 /actionpack/lib/abstract_controller | |
| parent | eeda059818ae95620a7c7b86ad0ff2fa621cbe88 (diff) | |
| download | rails-17f66473bce0decb2e5ff23142d4046056ccca1b.tar.gz rails-17f66473bce0decb2e5ff23142d4046056ccca1b.tar.bz2 rails-17f66473bce0decb2e5ff23142d4046056ccca1b.zip | |
AC::Head now doesn't have an unfulfilled Rendering dependency, and instead works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency)
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 905d04e20d..9d57c52429 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -5,6 +5,7 @@ module AbstractController class Base attr_internal :response_body attr_internal :action_name + attr_internal :formats class << self attr_reader :abstract diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 8ef2526df0..f4e1580977 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -16,7 +16,6 @@ module AbstractController include AbstractController::Logger included do - attr_internal :formats extlib_inheritable_accessor :_view_paths self._view_paths ||= ActionView::PathSet.new end |