diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-07 14:00:39 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-07 14:00:39 -0800 |
| commit | de4a60c9f468bb5bf4bd38220377cc5ac8385102 (patch) | |
| tree | 76d5fbe8eb154b277ec095fecb08033d5d993350 /actionpack/CHANGELOG.md | |
| parent | c6839277a9262ea87329c719443cf19e33038f3f (diff) | |
| parent | 73deb3af23765882f67869afb4eaa8ad74a351d1 (diff) | |
| download | rails-de4a60c9f468bb5bf4bd38220377cc5ac8385102.tar.gz rails-de4a60c9f468bb5bf4bd38220377cc5ac8385102.tar.bz2 rails-de4a60c9f468bb5bf4bd38220377cc5ac8385102.zip | |
Merge pull request #9464 from jcoyne/assert_template_file
Allow use of assert_template with the :file option.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 3fc3e06160..8f7236c596 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -16,6 +16,12 @@ *Yves Senn* +* Fixed regression when using `assert_template` to verify files sent using + `render file: 'README.md'`. + Fixes #9464. + + *Justin Coyne* + * Skip valid encoding checks for non-String parameters that come from the matched route's defaults. Fixes #9435. |