From 6d67c0ef969dc6c1315b893205482dff92ee4693 Mon Sep 17 00:00:00 2001 From: Philip Nguyen Date: Thu, 22 Sep 2016 16:17:03 -0700 Subject: Add #25546 and #25817 to changelog [ci skip] --- actionpack/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 96af4d9397..e7b8e1b628 100644 --- 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* -- cgit v1.2.3