diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-12 14:25:27 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-12 14:25:27 -0700 |
| commit | 10cdbbc56bf31da3a2e030dfe9d399507348f54e (patch) | |
| tree | c1e1b4371a1dd2a10460fcc503980ffb86d46f14 /railties | |
| parent | 5dd2cfc8b4a89ec6321ebbb0e81cd50d58785b6f (diff) | |
| parent | 8381d398cedf3e95fb073b8110d80f636cff449c (diff) | |
| download | rails-10cdbbc56bf31da3a2e030dfe9d399507348f54e.tar.gz rails-10cdbbc56bf31da3a2e030dfe9d399507348f54e.tar.bz2 rails-10cdbbc56bf31da3a2e030dfe9d399507348f54e.zip | |
Merge branch '3-2-stable-rel' into 3-2-stable
* 3-2-stable-rel:
updating changelogs
bumping version numbers
updating changelogs with security fixes
updating changelogs
Array parameters should not contain nil values.
Additional fix for CVE-2012-2661
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index c2a4962ded..1fbfd092e1 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +## Rails 3.2.6 (Jun 12, 2012) + +* No changes. + ## Rails 3.2.4 (May 31, 2012) ## * Add hook for resource route's generator. *Santiago Pastorino* diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 2bd7c1c020..421c6e687a 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 = 5 + TINY = 6 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |