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 /activesupport | |
| 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 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 10 | ||||
| -rw-r--r-- | activesupport/lib/active_support/version.rb | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index e22aded195..6123be4ab4 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 3.2.19 (Jul 2, 2014) ## + +* Make sure Active Support configurations are applied correctly. + + Before this change configuration set using `config.active_support` + would not be set. + + *Rafael Mendonça França* + + ## Rails 3.2.18 (May 6, 2014) ## * No changes. diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index 10c9fca86c..6fdf950bc0 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -2,7 +2,7 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 18 + TINY = 19 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |