diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-04 16:25:50 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-04 22:34:15 -0200 |
| commit | 31a485fa5a843a766c4b889ee88a6c590a3a6ebb (patch) | |
| tree | 8450bb26acbe29d281de997bdbdb4721832530ea /actionpack/CHANGELOG.md | |
| parent | c82025fcd6f5da92448a1362b38c0a0a9e966a12 (diff) | |
| download | rails-31a485fa5a843a766c4b889ee88a6c590a3a6ebb.tar.gz rails-31a485fa5a843a766c4b889ee88a6c590a3a6ebb.tar.bz2 rails-31a485fa5a843a766c4b889ee88a6c590a3a6ebb.zip | |
Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_option
Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix.
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index ff72af724b..8e5f4a4a56 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,12 @@ +* Fix regression when using `ActionView::Helpers::TranslationHelper#translate` with + `options[:raise]`. + + This regression was introduced at ec16ba75a5493b9da972eea08bae630eba35b62f. + + *Shota Fukumori (sora_h)* + +## Rails 3.2.16 ## + * Deep Munge the parameters for GET and POST Fixes CVE-2013-6417 * Stop using i18n's built in HTML error handling. Fixes: CVE-2013-4491 |