diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-22 20:24:09 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-22 20:24:09 -0300 |
| commit | 2b3ce8627b6b4a401a2e869b22e51cc88d52c49b (patch) | |
| tree | 7205ec41e28059371d2a9c874ce0ceab7f57498d /activerecord | |
| parent | d8353073d1d00ace843eb5e402ebc7fdb2d7c342 (diff) | |
| parent | c69ccea6f291fd3dd18d20597abf268bcc1233cf (diff) | |
| download | rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.gz rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.bz2 rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.zip | |
Merge branch '3-2-14' 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 88f69a7308..608e10f866 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,10 @@ -## unreleased ## +## Rails 3.2.14 (Jul 22, 2013) ## + +* Do not re-create destroyed association when saving the parent object. + + Fixes #11450. + + *Paul Nikitochkin* * Do not shallow the original exception in `exec_cache` on PostgreSQL adapter. diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 9069d9964f..9e3d1539c6 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 13 + TINY = 14 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |