diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-08-27 11:39:06 +0200 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-08-27 11:39:06 +0200 |
| commit | 08704c442d15b16511214731dd94108b737ef407 (patch) | |
| tree | d92d53f39245256dea6aa38a11500938adccf777 /actionpack/CHANGELOG | |
| parent | 920ad94598a9b90d048cb7cb19a34d7cb9e80392 (diff) | |
| parent | 5db2f199aba9aa8d00adefa8237922ad684aca03 (diff) | |
| download | rails-08704c442d15b16511214731dd94108b737ef407.tar.gz rails-08704c442d15b16511214731dd94108b737ef407.tar.bz2 rails-08704c442d15b16511214731dd94108b737ef407.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 177c6a354e..6f65d4003d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -7,8 +7,14 @@ * Update Prototype to 1.6.0.2 #599 [Patrick Joyce] * Conditional GET utility methods. [Jeremy Kemper] - * etag!([:admin, post, current_user]) sets the ETag response header and returns head(:not_modified) if it matches the If-None-Match request header. - * last_modified!(post.updated_at) sets Last-Modified and returns head(:not_modified) if it's no later than If-Modified-Since. + response.last_modified = @post.updated_at + response.etag = [:admin, @post, current_user] + + if request.fresh?(response) + head :not_modified + else + # render ... + end * All 2xx requests are considered successful [Josh Peek] |