diff options
| author | heavysixer <heavysixer@gmail.com> | 2008-10-25 13:33:39 -0500 |
|---|---|---|
| committer | heavysixer <heavysixer@gmail.com> | 2008-10-25 13:33:39 -0500 |
| commit | 14f05140e53f4f58bc86ee08b9a4ba836c14f9be (patch) | |
| tree | 03b975c55bb42b964edc8a3507f63f92487a42ed /activeresource | |
| parent | 35f29f7ea5ba183e49e26367cc31649ff4bd0e97 (diff) | |
| parent | 650aa015789c704ca8ea864f1117faf3f404a59b (diff) | |
| download | rails-14f05140e53f4f58bc86ee08b9a4ba836c14f9be.tar.gz rails-14f05140e53f4f58bc86ee08b9a4ba836c14f9be.tar.bz2 rails-14f05140e53f4f58bc86ee08b9a4ba836c14f9be.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
| -rw-r--r-- | activeresource/Rakefile | 6 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index e93b3ec15b..74ca71f65a 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,4 +1,4 @@ -*Edge* +*2.2.0 [RC1] (October 24th, 2008)* * Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 [Rasik Pandey, Cody Fauser] diff --git a/activeresource/Rakefile b/activeresource/Rakefile index 8c3ad36a02..ef6efd4903 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -65,7 +65,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.1.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.2.0' + PKG_BUILD) s.require_path = 'lib' s.autorequire = 'active_resource' @@ -115,8 +115,8 @@ end desc "Publish the beta gem" task :pgem => [:package] do - Rake::SshFilePublisher.new("wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload - `ssh wrath.rubyonrails.org './gemupdate.sh'` + Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload + `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'` end desc "Publish the API documentation" diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 88798ea1c1..d56f4cf17e 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -1,7 +1,7 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 2 - MINOR = 1 + MINOR = 2 TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') |