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 /activeresource | |
| 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 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG | 9 | ||||
| -rw-r--r-- | activeresource/Rakefile | 2 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index ea0f7b1b1d..6572934893 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,11 +1,6 @@ -*2.3.1 [RC2] (March 5, 2009)* +*2.3.2 [Final] (March 15, 2009)* -* Nothing new, just included in 2.3.1 - - -*2.3.0 [RC1] (February 1st, 2009)* - -* Nothing new, just included in 2.3.0 +* Nothing new, just included in 2.3.2 *2.2.1 [RC2] (November 14th, 2008)* diff --git a/activeresource/Rakefile b/activeresource/Rakefile index fc67b52089..bf7bbb0201 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -67,7 +67,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.require_path = 'lib' s.autorequire = 'active_resource' diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 4ac7eb1c06..3df2555d53 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,7 +2,7 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 1 + TINY = 2 STRING = [MAJOR, MINOR, TINY].join('.') end |