diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-28 04:20:49 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-28 04:20:49 +0100 |
| commit | 6f0caa1a534a065753d51430b649114bc8bf54ac (patch) | |
| tree | af9657373436a38ef7828b26a804d1fe12e479ad /actionpack/lib/action_controller/caching | |
| parent | 726b7ede54031eecfcee34eec80040553e9ad19f (diff) | |
| parent | 245542ea2994961731be105db6c076256a22a7a9 (diff) | |
| download | rails-6f0caa1a534a065753d51430b649114bc8bf54ac.tar.gz rails-6f0caa1a534a065753d51430b649114bc8bf54ac.tar.bz2 rails-6f0caa1a534a065753d51430b649114bc8bf54ac.zip | |
Merge branch 'master' of https://github.com/rails/rails into performance_test
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 2c8a6e4d4d..5fc6956266 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -56,19 +56,18 @@ module ActionController #:nodoc: # # caches_page :public # - # caches_action :index, :if => proc do |c| - # !c.request.format.json? # cache if is not a JSON request + # caches_action :index, :if => proc do + # !request.format.json? # cache if is not a JSON request # end # # caches_action :show, :cache_path => { :project => 1 }, # :expires_in => 1.hour # - # caches_action :feed, :cache_path => proc do |c| - # if c.params[:user_id] - # c.send(:user_list_url, - # c.params[:user_id], c.params[:id]) + # caches_action :feed, :cache_path => proc do + # if params[:user_id] + # user_list_url(params[:user_id, params[:id]) # else - # c.send(:list_url, c.params[:id]) + # list_url(params[:id]) # end # end # end |