diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-01-15 07:28:21 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-01-15 07:28:21 +0000 |
| commit | 3f96b6973b82ad17e443dd1d21be05996fb6fbf0 (patch) | |
| tree | b5fc571abe0b034b61c30b96afbca22743d93b3d /actionpack/lib/action_controller | |
| parent | d8e710410ea300ec4626250c0b35946cb52bc38c (diff) | |
| parent | 34dc028e75137707c46f81e1db942dad6660fb31 (diff) | |
| download | rails-3f96b6973b82ad17e443dd1d21be05996fb6fbf0.tar.gz rails-3f96b6973b82ad17e443dd1d21be05996fb6fbf0.tar.bz2 rails-3f96b6973b82ad17e443dd1d21be05996fb6fbf0.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index b210ee3423..febbc72861 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -51,7 +51,7 @@ module ActionController # # def show # @article = Article.find(params[:id]) - # fresh_when(etag: @article, last_modified: @article.created_at, public: true) + # fresh_when(etag: @article, last_modified: @article.updated_at, public: true) # end # # This will render the show template if the request isn't sending a matching ETag or @@ -115,7 +115,7 @@ module ActionController # def show # @article = Article.find(params[:id]) # - # if stale?(etag: @article, last_modified: @article.created_at) + # if stale?(etag: @article, last_modified: @article.updated_at) # @statistics = @article.really_expensive_call # respond_to do |format| # # all the supported formats |