aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-08-29 15:09:39 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-08-29 15:09:39 -0700
commitd4b8052e04d2e01f36d008e6e9d05097b6fe6184 (patch)
tree8455fac0c02642fc236261825813e4ce7b65ca68
parent0093dafd804c59ea1685cdab2a79b37d63c8dbf0 (diff)
parentee2da014c472052fe7e2f8d897df253a3e579ba9 (diff)
downloadrails-d4b8052e04d2e01f36d008e6e9d05097b6fe6184.tar.gz
rails-d4b8052e04d2e01f36d008e6e9d05097b6fe6184.tar.bz2
rails-d4b8052e04d2e01f36d008e6e9d05097b6fe6184.zip
Merge pull request #7480 from aaronbrethorst/master
Fix markdown rendering of the ActionPack changelog [ci skip]
-rw-r--r--actionpack/CHANGELOG.md16
1 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 9469e5b488..1232370439 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -2,15 +2,15 @@
* Added controller-level etag additions that will be part of the action etag computation *Jeremy Kemper/DHH*
- class InvoicesController < ApplicationController
- etag { current_user.try :id }
-
- def show
- # Etag will differ even for the same invoice when it's viewed by a different current_user
- @invoice = Invoice.find(params[:id])
- fresh_when(@invoice)
+ class InvoicesController < ApplicationController
+ etag { current_user.try :id }
+
+ def show
+ # Etag will differ even for the same invoice when it's viewed by a different current_user
+ @invoice = Invoice.find(params[:id])
+ fresh_when(@invoice)
+ end
end
- end
* Add automatic template digests to all CacheHelper#cache calls (originally spiked in the cache_digests plugin) *DHH*