diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 2fd37484cb..fdc9be2ff4 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,6 +1,6 @@ *Edge* -* Added stale?/fresh? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [DHH]. Example: +* Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [DHH]. Example: class ArticlesController < ApplicationController def show_with_respond_to_block diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 56f4f80617..2cff05dfa4 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1096,11 +1096,6 @@ module ActionController #:nodoc: !request.fresh?(response) end - # The opposite of stale? provided for parity when that feels more natural. - def fresh?(options) - !stale?(options) - end - # Sets the etag, last_modified, or both on the response and renders a # "304 Not Modified" response if the request is already fresh. # |