diff options
| author | Claudio B <claudiob@users.noreply.github.com> | 2016-09-23 13:44:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 13:44:51 -0700 |
| commit | 4ce44fa0d73aa9fec6cc0b02f31ee972fde8acb1 (patch) | |
| tree | 657dc054f54c17443f87ee8a4a7f5c5fbdc18cb4 | |
| parent | 780058ba1e781afdd76fb6c0732b5b883aa8daae (diff) | |
| parent | 6d67c0ef969dc6c1315b893205482dff92ee4693 (diff) | |
| download | rails-4ce44fa0d73aa9fec6cc0b02f31ee972fde8acb1.tar.gz rails-4ce44fa0d73aa9fec6cc0b02f31ee972fde8acb1.tar.bz2 rails-4ce44fa0d73aa9fec6cc0b02f31ee972fde8acb1.zip | |
Merge pull request #26591 from philipqnguyen/changelog-fix-etag-template
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* |