diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-16 11:20:28 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-16 11:20:28 +0000 |
| commit | fc123d189c7394374af91a51efdcc756d3b11185 (patch) | |
| tree | d0bc7c4760197a4abdea3b3f008a1615436acf54 /activerecord | |
| parent | 6c688d000f7dc8a4e65d6730c7c425839d2583b4 (diff) | |
| parent | 4185a4a5f5e53b55c9ba3757a837d33fb91f4091 (diff) | |
| download | rails-fc123d189c7394374af91a51efdcc756d3b11185.tar.gz rails-fc123d189c7394374af91a51efdcc756d3b11185.tar.bz2 rails-fc123d189c7394374af91a51efdcc756d3b11185.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 4 | ||||
| -rw-r--r-- | activerecord/Rakefile | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 6d2f597004..c73ac4649e 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,11 +1,9 @@ -*2.3.1 [RC2] (March 5, 2009)* +*2.3.2 [Final] (March 15, 2009)* * Added ActiveRecord::Base.find_each and ActiveRecord::Base.find_in_batches for batch processing [DHH/Jamis Buck] * Added that ActiveRecord::Base.exists? can be called with no arguments #1817 [Scott Taylor] -*2.3.0 [RC1] (February 1st, 2009)* - * Add Support for updating deeply nested models from a single form. #1202 [Eloy Duran] class Book < ActiveRecord::Base diff --git a/activerecord/Rakefile b/activerecord/Rakefile index aec9b3825b..b50008c971 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -177,7 +177,7 @@ spec = Gem::Specification.new do |s| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end - s.add_dependency('activesupport', '= 2.3.1' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD) s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite" s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite" diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 809e91897e..852807b4c5 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 = 2 MINOR = 3 - TINY = 1 + TINY = 2 STRING = [MAJOR, MINOR, TINY].join('.') end |