Merge pull request #7480 from aaronbrethorst/master

Fix markdown rendering of the ActionPack changelog [ci skip]

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*