diff options
| -rw-r--r-- | RAILS_VERSION | 2 | ||||
| -rw-r--r-- | actionmailer/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 4 | ||||
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 4 | ||||
| -rw-r--r-- | activemodel/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 4 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 4 | ||||
| -rw-r--r-- | activeresource/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 4 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/version.rb | 4 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 4 | ||||
| -rw-r--r-- | 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 |