diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-04-02 14:57:30 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-04-02 14:57:30 +0430 |
| commit | 0dd3eac967b3dc0225dc4f8b90a3043de54e2fb7 (patch) | |
| tree | a3a540e38b1e5f6b36f261ae9b2f0116d1f6e39a /activeresource | |
| parent | 13e3f9c0ce83900d3d5647899a4cff443689c266 (diff) | |
| parent | 3adaef8ae73a3061a9fe4c5e0256d80bc09b1cf4 (diff) | |
| download | rails-0dd3eac967b3dc0225dc4f8b90a3043de54e2fb7.tar.gz rails-0dd3eac967b3dc0225dc4f8b90a3043de54e2fb7.tar.bz2 rails-0dd3eac967b3dc0225dc4f8b90a3043de54e2fb7.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
| -rw-r--r-- | activeresource/activeresource.gemspec | 1 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 113694e895..27bf99a8ee 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,4 +1,4 @@ -*Edge* +*Rails 3.0.0 [beta 1] (February 4, 2010)* * Add support for errors in JSON format. #1956 [Fabien Jakimowicz] diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 3718bb4f2e..ca74c0dd7d 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -6,6 +6,7 @@ Gem::Specification.new do |s| s.version = version s.summary = 'REST modeling framework (part of Rails).' s.description = 'REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.' + s.required_ruby_version = '>= 1.8.7' s.author = 'David Heinemeier Hansson' diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index bb60954e05..d01ebd017f 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -3,7 +3,7 @@ module ActiveResource MAJOR = 3 MINOR = 0 TINY = 0 - BUILD = "beta1" + BUILD = "beta2" STRING = [MAJOR, MINOR, TINY, BUILD].join('.') end |