From facfc24f256d8367f33a62e3bbea6c0f8c698c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 8 Jul 2013 16:47:00 -0300
Subject: Preparing for 3.2.14.rc1 release

---
 RAILS_VERSION                                 | 2 +-
 actionmailer/CHANGELOG.md                     | 2 +-
 actionmailer/lib/action_mailer/version.rb     | 4 ++--
 actionpack/CHANGELOG.md                       | 2 +-
 actionpack/lib/action_pack/version.rb         | 4 ++--
 activemodel/CHANGELOG.md                      | 2 +-
 activemodel/lib/active_model/version.rb       | 4 ++--
 activerecord/CHANGELOG.md                     | 2 +-
 activerecord/lib/active_record/version.rb     | 4 ++--
 activeresource/CHANGELOG.md                   | 4 +++-
 activeresource/lib/active_resource/version.rb | 4 ++--
 activesupport/CHANGELOG.md                    | 2 +-
 activesupport/lib/active_support/version.rb   | 4 ++--
 railties/CHANGELOG.md                         | 2 +-
 railties/lib/rails/version.rb                 | 4 ++--
 version.rb                                    | 4 ++--
 16 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/RAILS_VERSION b/RAILS_VERSION
index d883a10059..6a5d395522 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.2.13
+3.2.14.rc1
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index ce37730c44..a8908d713f 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
 *   No changes.
 
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 00f0516066..f98a402a53 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -2,8 +2,8 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index ac260a9592..bf697a3800 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
 *   Merge `:action` from routing scope and assign endpoint if both `:controller`
     and `:action` are present. The endpoint assignment only occurs if there is
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index f319266765..4189730e75 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -2,8 +2,8 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 470e76b7d3..8166246cfc 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
 *   No changes.
 
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index ec0efc72b7..277e29eb62 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 88f69a7308..37adce4f30 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
 *   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..b220f08663 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -2,8 +2,8 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 1d084ec5d9..a4c97dc12c 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,14 +1,16 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 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.
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 6c3ee00be6..6f0395bba1 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -2,8 +2,8 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 20579e44d3..b27b6194e6 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
 *   Make `Time.at_with_coercion` retain the second fraction and return local time.
 
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index 03b1e511d9..9f81b63b36 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -2,8 +2,8 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 4e75cb8375..913435f4cd 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
 *   Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
     `rails benchmarker`.
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 0145879c87..bc535fc501 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/version.rb b/version.rb
index 0145879c87..bc535fc501 100644
--- a/version.rb
+++ b/version.rb
@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3


From 2ae2728d78298030b1015497840b0519b5ed21a1 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Mon, 15 Jul 2013 11:17:25 -0700
Subject: Merge pull request #11451 from
 jetthoughts/11450_do_not_resave_destroyed_association

Do not re-save destroyed association on saving parent object
Conflicts:
	activerecord/lib/active_record/autosave_association.rb
---
 activerecord/CHANGELOG.md                              | 9 +++++++++
 activerecord/lib/active_record/autosave_association.rb | 2 ++
 activerecord/test/cases/autosave_association_test.rb   | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 37adce4f30..59f670dd4a 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,12 @@
+## Rails 3.2.14.rc2 (unreleased) ##
+
+*   Do not re-create destroyed association when saving the parent object.
+
+    Fixes #11450.
+
+    *Paul Nikitochkin*
+
+
 ## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
 *   Do not shallow the original exception in `exec_cache` on PostgreSQL adapter.
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index 3fc9d307bc..4da39299f0 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -339,6 +339,8 @@ module ActiveRecord
             end
 
             records.each do |record|
+              next if record.destroyed?
+
               saved = true
 
               if autosave != false && (@new_record_before_save || record.new_record?)
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index 6dbc419eb5..5556ab8fcc 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -734,6 +734,13 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
     ids.each { |id| assert_nil klass.find_by_id(id) }
   end
 
+  def test_should_not_resave_destroyed_association
+    @pirate.birds.create!(name: :parrot)
+    @pirate.birds.first.destroy
+    @pirate.save!
+    assert @pirate.reload.birds.empty?
+  end
+
   def test_should_skip_validation_on_has_many_if_marked_for_destruction
     2.times { |i| @pirate.birds.create!(:name => "birds_#{i}") }
 
-- 
cgit v1.2.3


From 1900a56669ba1fc6776fe64534ff1f45104e343c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 15 Jul 2013 17:44:49 -0300
Subject: Use Ruby 1.8 syntax

---
 activerecord/test/cases/autosave_association_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index 5556ab8fcc..cb68f96412 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -735,7 +735,7 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
   end
 
   def test_should_not_resave_destroyed_association
-    @pirate.birds.create!(name: :parrot)
+    @pirate.birds.create!(:name => :parrot)
     @pirate.birds.first.destroy
     @pirate.save!
     assert @pirate.reload.birds.empty?
-- 
cgit v1.2.3


From a96df04aac00fb2b7d91978c24741100230a50d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 16 Jul 2013 13:00:33 -0300
Subject: Preparing for 3.2.14.rc2 release

---
 RAILS_VERSION                                 | 2 +-
 actionmailer/CHANGELOG.md                     | 7 ++++++-
 actionmailer/lib/action_mailer/version.rb     | 2 +-
 actionpack/CHANGELOG.md                       | 7 ++++++-
 actionpack/lib/action_pack/version.rb         | 2 +-
 activemodel/CHANGELOG.md                      | 7 ++++++-
 activemodel/lib/active_model/version.rb       | 2 +-
 activerecord/CHANGELOG.md                     | 4 ++--
 activerecord/lib/active_record/version.rb     | 2 +-
 activeresource/CHANGELOG.md                   | 7 ++++++-
 activeresource/lib/active_resource/version.rb | 2 +-
 activesupport/CHANGELOG.md                    | 7 ++++++-
 activesupport/lib/active_support/version.rb   | 2 +-
 railties/CHANGELOG.md                         | 7 ++++++-
 railties/lib/rails/version.rb                 | 2 +-
 version.rb                                    | 2 +-
 16 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/RAILS_VERSION b/RAILS_VERSION
index 6a5d395522..c172f793ad 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.2.14.rc1
+3.2.14.rc2
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index a8908d713f..9cdd3a80ff 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   No changes.
 
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index f98a402a53..564edd7f94 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -3,7 +3,7 @@ module ActionMailer
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index bf697a3800..03803d2898 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   Merge `:action` from routing scope and assign endpoint if both `:controller`
     and `:action` are present. The endpoint assignment only occurs if there is
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 4189730e75..d33d9b60b9 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 8166246cfc..9862c2443d 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   No changes.
 
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index 277e29eb62..f19367d606 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -3,7 +3,7 @@ module ActiveModel
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 59f670dd4a..6e88e4614a 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.14.rc2 (unreleased) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
 
 *   Do not re-create destroyed association when saving the parent object.
 
@@ -7,7 +7,7 @@
     *Paul Nikitochkin*
 
 
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   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 b220f08663..d6dbb0b74d 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  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index a4c97dc12c..7a07c70a49 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   Fixes an issue that ActiveResource models ignores ActiveResource::Base.include_root_in_json.
     Backported from the now separate repo rails/activeresouce.
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 6f0395bba1..0f7bf6034a 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -3,7 +3,7 @@ module ActiveResource
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index b27b6194e6..4ce63efd19 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   Make `Time.at_with_coercion` retain the second fraction and return local time.
 
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index 9f81b63b36..b81d59b69c 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 913435f4cd..e5a08b11f7 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
     `rails benchmarker`.
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index bc535fc501..dfc7cb5ff4 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/version.rb b/version.rb
index bc535fc501..dfc7cb5ff4 100644
--- a/version.rb
+++ b/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3


From 47fb44fc7a12f6a57b71b6dcd68a19e572101703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 22 Jul 2013 11:57:02 -0300
Subject: Update CHANGELOG entry

---
 actionmailer/CHANGELOG.md   | 7 +------
 actionpack/CHANGELOG.md     | 7 +------
 activerecord/CHANGELOG.md   | 5 +----
 activeresource/CHANGELOG.md | 7 +------
 activesupport/CHANGELOG.md  | 7 +------
 railties/CHANGELOG.md       | 7 +------
 6 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 9cdd3a80ff..37241dc4ad 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
+## Rails 3.2.14 (Jul 22, 2013) ##
 
 *   No changes.
 
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 03803d2898..119515c75b 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
+## Rails 3.2.14 (Jul 22, 2013) ##
 
 *   Merge `:action` from routing scope and assign endpoint if both `:controller`
     and `:action` are present. The endpoint assignment only occurs if there is
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6e88e4614a..608e10f866 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+## Rails 3.2.14 (Jul 22, 2013) ##
 
 *   Do not re-create destroyed association when saving the parent object.
 
@@ -6,9 +6,6 @@
 
     *Paul Nikitochkin*
 
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
-
 *   Do not shallow the original exception in `exec_cache` on PostgreSQL adapter.
 
     Fixes #11260.
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 7a07c70a49..dd618e4f27 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
+## 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.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 4ce63efd19..aa71bf9be1 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
+## Rails 3.2.14 (Jul 22, 2013) ##
 
 *   Make `Time.at_with_coercion` retain the second fraction and return local time.
 
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e5a08b11f7..c12b598f0d 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
+## Rails 3.2.14 (Jul 22, 2013) ##
 
 *   Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
     `rails benchmarker`.
-- 
cgit v1.2.3


From 2fcd13eff251ca9e1ff5cf6a13f72c18087daf60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 22 Jul 2013 12:05:41 -0300
Subject: Preparing for 3.2.14 release

---
 RAILS_VERSION                                 | 2 +-
 actionmailer/lib/action_mailer/version.rb     | 2 +-
 actionpack/lib/action_pack/version.rb         | 2 +-
 activemodel/lib/active_model/version.rb       | 2 +-
 activerecord/lib/active_record/version.rb     | 2 +-
 activeresource/lib/active_resource/version.rb | 2 +-
 activesupport/lib/active_support/version.rb   | 2 +-
 railties/lib/rails/version.rb                 | 2 +-
 version.rb                                    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/RAILS_VERSION b/RAILS_VERSION
index c172f793ad..23c635a1e0 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.2.14.rc2
+3.2.14
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 564edd7f94..6f596710d4 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -3,7 +3,7 @@ module ActionMailer
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index d33d9b60b9..993c5d7d2a 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index f19367d606..8fdcf687fd 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -3,7 +3,7 @@ module ActiveModel
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index d6dbb0b74d..9e3d1539c6 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  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 0f7bf6034a..b1dd63a363 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -3,7 +3,7 @@ module ActiveResource
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index b81d59b69c..8b9d3bcdca 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index dfc7cb5ff4..a5531699b4 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
diff --git a/version.rb b/version.rb
index dfc7cb5ff4..a5531699b4 100644
--- a/version.rb
+++ b/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3


From c69ccea6f291fd3dd18d20597abf268bcc1233cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 22 Jul 2013 20:23:42 -0300
Subject: Fix activemodel CHANGELOG

---
 activemodel/CHANGELOG.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 9862c2443d..ad3c7f43f5 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
+## Rails 3.2.14 (Jul 22, 2013) ##
 
 *   No changes.
 
-- 
cgit v1.2.3