diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-09 18:15:59 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-09 18:15:59 -0300 |
| commit | 7987e7419a75b5677841c4f215791a73083a154a (patch) | |
| tree | 7164002ad5b52dd5a52114cfd9a4a2f7c5fc7049 /activerecord | |
| parent | 0f9a6a7c80a2beeaace875d8a9d89a164811d729 (diff) | |
| parent | 64146cf7babe35fd962576b699fa0deb4cfe0d70 (diff) | |
| download | rails-7987e7419a75b5677841c4f215791a73083a154a.tar.gz rails-7987e7419a75b5677841c4f215791a73083a154a.tar.bz2 rails-7987e7419a75b5677841c4f215791a73083a154a.zip | |
Merge branch '3-2-8' into 3-2-stable
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 8 | ||||
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 01f41184cd..69387cd77c 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -16,7 +16,13 @@ *Seamus Abshere* -## Rails 3.2.8 ## +## Rails 3.2.8 (Aug 9, 2012) ## + +* Do not consider the numeric attribute as changed if the old value is zero and the new value + is not a string. + Fixes #7237. + + *Rafael Mendonça França* * Do not consider the numeric attribute as changed if the old value is zero and the new value is not a string. diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 9dea5ae187..0f91199469 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -3,7 +3,7 @@ module ActiveRecord MAJOR = 3 MINOR = 2 TINY = 8 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |