aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RAILS_VERSION2
-rw-r--r--actionmailer/CHANGELOG.md7
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
-rw-r--r--actionpack/CHANGELOG.md7
-rw-r--r--actionpack/lib/action_pack/version.rb2
-rw-r--r--activemodel/CHANGELOG.md7
-rw-r--r--activemodel/lib/active_model/version.rb2
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/version.rb2
-rw-r--r--activeresource/CHANGELOG.md7
-rw-r--r--activeresource/lib/active_resource/version.rb2
-rw-r--r--activesupport/CHANGELOG.md7
-rw-r--r--activesupport/lib/active_support/version.rb2
-rw-r--r--railties/CHANGELOG.md7
-rw-r--r--railties/lib/rails/version.rb2
-rw-r--r--version.rb2
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 21:49:08 +0000