diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-13 00:49:48 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-13 00:49:48 +0530 |
| commit | ab8071f81e518d53396504156e2b9bb16249d05f (patch) | |
| tree | bcbc3750309df5013776f4dda93989e0fd7b33aa /actionpack/lib | |
| parent | 57c194568788ea2246b5e262ca3ad5baeaada96d (diff) | |
| parent | 509af8faafea44a6629d92cb7efd29614d94d549 (diff) | |
| download | rails-ab8071f81e518d53396504156e2b9bb16249d05f.tar.gz rails-ab8071f81e518d53396504156e2b9bb16249d05f.tar.bz2 rails-ab8071f81e518d53396504156e2b9bb16249d05f.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 3b86a9a93a..e76a79f710 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -56,14 +56,14 @@ module ActionController #:nodoc: # # caches_page :public # - # caches_action :index, :if => proc do + # caches_action :index, :if => Proc.new 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 + # caches_action :feed, :cache_path => Proc.new do # if params[:user_id] # user_list_url(params[:user_id, params[:id]) # else |