diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-02 14:18:47 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-02 14:18:47 -0300 |
| commit | c43f20a4048ff2b245f8f163c2f9642f56c697a0 (patch) | |
| tree | 5814f108b5fa98c1412e0dad6125d4b0d1e82910 /actionpack | |
| parent | 3622858ed514493f730649d87428e12de1501ed8 (diff) | |
| parent | 53c845cb185036c71cc9793c4eb6bf4dc989307b (diff) | |
| download | rails-c43f20a4048ff2b245f8f163c2f9642f56c697a0.tar.gz rails-c43f20a4048ff2b245f8f163c2f9642f56c697a0.tar.bz2 rails-c43f20a4048ff2b245f8f163c2f9642f56c697a0.zip | |
Merge branch '3-2-sec' into 3-2-stable
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 643e926312..15fc0af20e 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 3.2.19 (Jul 2, 2014) ## + * Fix regression when using `ActionView::Helpers::TranslationHelper#translate` with `options[:raise]`. diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index ac6d3343b9..3dc00b99fe 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -2,7 +2,7 @@ module ActionPack module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 18 + TINY = 19 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |