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 /activerecord | |
| 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 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index c12520d6d8..bdadb73ab8 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.7 (unreleased) ## +## Rails 3.2.7 (Jul 26, 2012) ## * `:finder_sql` and `:counter_sql` options on collection associations are deprecated. Please transition to using scopes. diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 43fc292302..a0ac059536 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 6 + TINY = 7 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |