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 16:25:50 -0800 |
commit | d1cec0841db059e2daece4486fc30c8a14d23993 (patch) | |
tree | 05f338e912a29ec109e7f2d94af85ac6451e8fdf /actionpack/CHANGELOG.md | |
parent | 49ed8a1a628ff8b7aa089df241cd3f487cfbd06f (diff) | |
parent | c1d5477b63e73dadec9f284fa55ec22d81f3bf36 (diff) | |
download | rails-d1cec0841db059e2daece4486fc30c8a14d23993.tar.gz rails-d1cec0841db059e2daece4486fc30c8a14d23993.tar.bz2 rails-d1cec0841db059e2daece4486fc30c8a14d23993.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.
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r-- | actionpack/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 83e188a41b..26ba89eb33 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,10 @@ +* Fix regression when using `ActionView::Helpers::TranslationHelper#translate` with + `options[:raise]`. + + This regression was introduced at ec16ba75a5493b9da972eea08bae630eba35b62f. + + *Shota Fukumori (sora_h)* + * Introducing Variants We often want to render different html/json/xml templates for phones, |