diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
commit | 6335f5d5186dfb97453dfa1a55aabe4c6f3962b0 (patch) | |
tree | 1582b9b5d7e2005aaa2dfe5a23e2d422fe4f094e /activeresource | |
parent | 70e3dfb2e9f94396eb6525d13f9adccd3e845c3d (diff) | |
parent | dc88847e5ce392eed210b97525c14fca55852867 (diff) | |
download | rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.gz rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.bz2 rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.zip |
Merge branch 'master' into bodyparts
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 |