aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-19 22:07:30 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-19 22:07:30 +0000
commitab3d187943d5fbef26d7c25781b6abf7734d6f46 (patch)
tree8123fdf9291a84eca3040b6d24656ca09c261dcc
parent055ff9f41844a90080ec12f2e632ff755f67f097 (diff)
downloadrails-ab3d187943d5fbef26d7c25781b6abf7734d6f46.tar.gz
rails-ab3d187943d5fbef26d7c25781b6abf7734d6f46.tar.bz2
rails-ab3d187943d5fbef26d7c25781b6abf7734d6f46.zip
Document caches_action. Closes #5419.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6787 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/caching.rb4
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))