aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-08 16:47:00 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-12 21:06:50 -0300
commitfacfc24f256d8367f33a62e3bbea6c0f8c698c1f (patch)
tree36c41ad6b934ce1cacf907fac029b4a545fe768e /railties
parent714cb5a436e72d00ca0e5e6efa4b789c3e6f5b04 (diff)
downloadrails-facfc24f256d8367f33a62e3bbea6c0f8c698c1f.tar.gz
rails-facfc24f256d8367f33a62e3bbea6c0f8c698c1f.tar.bz2
rails-facfc24f256d8367f33a62e3bbea6c0f8c698c1f.zip
Preparing for 3.2.14.rc1 release
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md2
-rw-r--r--railties/lib/rails/version.rb4
2 files changed, 3 insertions, 3 deletions
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