Skip to content

Commit

Permalink
Merge branch 'master' of github.com:lifo/docrails
Browse files Browse the repository at this point in the history
  • Loading branch information
vijaydev committed Jan 12, 2012
2 parents 57c1945 + 509af8f commit ab8071f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions actionpack/lib/action_controller/caching/actions.rb
Expand Up @@ -56,14 +56,14 @@ module Caching
# #
# caches_page :public # 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 # !request.format.json? # cache if is not a JSON request
# end # end
# #
# caches_action :show, :cache_path => { :project => 1 }, # caches_action :show, :cache_path => { :project => 1 },
# :expires_in => 1.hour # :expires_in => 1.hour
# #
# caches_action :feed, :cache_path => proc do # caches_action :feed, :cache_path => Proc.new do
# if params[:user_id] # if params[:user_id]
# user_list_url(params[:user_id, params[:id]) # user_list_url(params[:user_id, params[:id])
# else # else
Expand Down

0 comments on commit ab8071f

Please sign in to comment.