aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-05 13:17:18 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-06 11:33:10 -0300
commit4e8f1d258854d0d6a6bff5955ef1aeb4fbb1dc00 (patch)
tree10f425d092725127d9c6ada40c65628473521740 /railties
parent0f3b7d1a319383f743f9938e1eed00f0fba7a367 (diff)
downloadrails-4e8f1d258854d0d6a6bff5955ef1aeb4fbb1dc00.tar.gz
rails-4e8f1d258854d0d6a6bff5955ef1aeb4fbb1dc00.tar.bz2
rails-4e8f1d258854d0d6a6bff5955ef1aeb4fbb1dc00.zip
Preparing for 3.2.18 release
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md16
-rw-r--r--railties/lib/rails/version.rb2
2 files changed, 17 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 3e075a8f9f..ce832d12ee 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,7 +1,23 @@
+## Rails 3.2.18 (May 6, 2014) ##
+
+* No changes.
+
+
+## Rails 3.2.17 (Feb 18, 2014) ##
+
+* No changes.
+
+
+## Rails 3.2.16 (Dec 3, 2013) ##
+
+* No changes.
+
+
## Rails 3.2.15 (Oct 16, 2013) ##
* No changes.
+
## Rails 3.2.14 (Jul 22, 2013) ##
* Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 38890e162d..ec2f5467f0 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 17
+ TINY = 18
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')