Permalink
Browse files

Merge branch '3-2-14' into 3-2-stable

  • Loading branch information...
2 parents d835307 + c69ccea commit 2b3ce8627b6b4a401a2e869b22e51cc88d52c49b @rafaelfranca rafaelfranca committed Jul 22, 2013
View
@@ -1 +1 @@
-3.2.13
+3.2.14
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14 (Jul 22, 2013) ##
* No changes.
@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14 (Jul 22, 2013) ##
* Fix `ActionDispatch::Assertions::ResponseAssertions#assert_redirected_to`
does not show user-supplied message.
@@ -2,7 +2,7 @@ module ActionPack
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14 (Jul 22, 2013) ##
* No changes.
@@ -2,7 +2,7 @@ module ActiveModel
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -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.
@@ -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('.')
@@ -1,14 +1,16 @@
-## unreleased ##
+## Rails 3.2.14 (Jul 22, 2013) ##
* Fixes an issue that ActiveResource models ignores ActiveResource::Base.include_root_in_json.
Backported from the now separate repo rails/activeresouce.
*Xinjiang Lu*
+
## Rails 3.2.13 (Mar 18, 2013) ##
* No changes.
+
## Rails 3.2.12 (Feb 11, 2013) ##
* No changes.
@@ -2,7 +2,7 @@ module ActiveResource
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14 (Jul 22, 2013) ##
* Make `Time.at_with_coercion` retain the second fraction and return local time.
@@ -2,7 +2,7 @@ module ActiveSupport
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14 (Jul 22, 2013) ##
* Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
`rails benchmarker`.
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
View
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

0 comments on commit 2b3ce86

Please sign in to comment.