diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 4f316e94b6..0d08f4cb44 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Document caches_action. #5419 [Jarkko Laine] + * Update to Prototype 1.5.1. [Sam Stephenson] * Allow routes to be decalred under namespaces [Tobias Luetke]: diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 94d2ede685..00853db72e 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -180,7 +180,9 @@ module ActionController #:nodoc: base.send(:attr_accessor, :rendered_action_cache) end - module ClassMethods #:nodoc: + module ClassMethods + # Declares that +actions+ should be cached. + # See ActionController::Caching::Actions for details. def caches_action(*actions) return unless perform_caching around_filter(ActionCacheFilter.new(*actions)) |