diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-26 15:07:19 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-26 15:07:19 -0700 |
| commit | 133754ef172706c10d6d1f9393d4fb1a1b19e2d7 (patch) | |
| tree | c1f96570993ead95bfb8615e42bdc155e17c895e /railties | |
| parent | 3dae4400989174c12730285397c58caf1a2685af (diff) | |
| parent | d1b9cf2d48b4e58da2da563107dd2783e326e287 (diff) | |
| download | rails-133754ef172706c10d6d1f9393d4fb1a1b19e2d7.tar.gz rails-133754ef172706c10d6d1f9393d4fb1a1b19e2d7.tar.bz2 rails-133754ef172706c10d6d1f9393d4fb1a1b19e2d7.zip | |
Merge branch '3-2-rel' into 3-2-stable
* 3-2-rel:
updating release date
bumping to 3.2.7
updating the changelog
* Do not convert digest auth strings to symbols. CVE-2012-3424
updating the version
updating changelogs
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 1fbfd092e1..d79237c205 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.7 (Jul 26, 2012) + +* Since Rails 3.2, use layout false to render no layout +* Use strict_args_position! if available from Thor + ## Rails 3.2.6 (Jun 12, 2012) * No changes. diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 421c6e687a..0594737b29 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 = 6 + TINY = 7 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |