diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-16 10:20:36 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-16 10:20:36 -0700 |
| commit | 5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93 (patch) | |
| tree | fdd408aee29bd9e7a5c4ac3c36430e54c1d0e286 /activemodel | |
| parent | 6a185aa0a849ec7cd8d9536124505f668db11db5 (diff) | |
| parent | 538f8ba0c16bb6c57b5b79320fc1a99afd14b0e2 (diff) | |
| download | rails-5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93.tar.gz rails-5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93.tar.bz2 rails-5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93.zip | |
Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec:
updating changelogs
bumping to 3.2.15
bumping to rc3
Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
bumping to rc2
Merge pull request #12443 from arthurnn/add_inverse_of_add_target
bumping version to 3.2.15.rc1
Remove the use of String#% when formatting durations in log messages
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index ad3c7f43f5..7db08549d9 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,7 @@ +## Rails 3.2.15 (Oct 16, 2013) ## + +* No changes. + ## Rails 3.2.14 (Jul 22, 2013) ## * No changes. diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 8fdcf687fd..16fe93dbbc 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -2,7 +2,7 @@ module ActiveModel module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 14 + TINY = 15 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |