aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md8
-rw-r--r--activerecord/lib/active_record/version.rb2
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('.')