diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-09 18:15:59 -0300 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-09 18:15:59 -0300 |
commit | 7987e7419a75b5677841c4f215791a73083a154a (patch) | |
tree | 7164002ad5b52dd5a52114cfd9a4a2f7c5fc7049 /railties | |
parent | 0f9a6a7c80a2beeaace875d8a9d89a164811d729 (diff) | |
parent | 64146cf7babe35fd962576b699fa0deb4cfe0d70 (diff) | |
download | rails-7987e7419a75b5677841c4f215791a73083a154a.tar.gz rails-7987e7419a75b5677841c4f215791a73083a154a.tar.bz2 rails-7987e7419a75b5677841c4f215791a73083a154a.zip |
Merge branch '3-2-8' into 3-2-stable
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG.md | 2 | ||||
-rw-r--r-- | railties/lib/rails/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 2537993df3..52494d5232 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.8 ## +## Rails 3.2.8 (Aug 9, 2012) ## * ERB scaffold generator use the `:data => { :confirm => "Text" }` syntax instead of `:confirm`. diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index e429caa157..4565e13fc7 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 3 MINOR = 2 TINY = 8 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |