Merge pull request rails#26591 from philipqnguyen/changelog-fix-etag-…

…template Add rails#25546 and rails#25817 to changelog [ci skip]
Mihoid · Sep 23, 2016 · 4ce44fa · 4ce44fa
2 parents 780058b + 6d67c0e
commit 4ce44fa
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,3 +1,11 @@
+*   Fix adding implicitly rendered template digests to ETags.
+
+    Fixes a case when modifying an implicitly rendered template for a
+    controller action using `fresh_when` or `stale?` would not result in a new
+    `ETag` value.
+
+    *Javan Makhmali*
+
 *   Make `fixture_file_upload` work in integration tests.
 
     *Yuji Yaginuma*