diff options
author | Philip Nguyen <philip.nguyen@fullscreen.net> | 2016-09-22 16:17:03 -0700 |
---|---|---|
committer | Philip Nguyen <philip.nguyen@fullscreen.net> | 2016-09-23 10:26:05 -0700 |
commit | 6d67c0ef969dc6c1315b893205482dff92ee4693 (patch) | |
tree | ba25f74141f2d8e2d59358e837aef7f46e92de80 | |
parent | f08bb28702a2df5d2f9e3a354aa63cf7e738dc58 (diff) | |
download | rails-6d67c0ef969dc6c1315b893205482dff92ee4693.tar.gz rails-6d67c0ef969dc6c1315b893205482dff92ee4693.tar.bz2 rails-6d67c0ef969dc6c1315b893205482dff92ee4693.zip |
Add #25546 and #25817 to changelog [ci skip]
-rw-r--r-- | actionpack/CHANGELOG.md | 8 |
1 files changed, 8 insertions, 0 deletions
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* |