diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-04 13:05:27 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-04 13:05:27 +0100 |
| commit | ab14e3f8628da81535c09eab3ba48d06725c6769 (patch) | |
| tree | 1409b4049bbc3075f7618a4759797dc6de2116d9 /actionpack | |
| parent | 31248fe3698c8d6c54465dfdf463ea49749e1c33 (diff) | |
| parent | c9ec28b2b643de7a315276cc285d7a4506b9d568 (diff) | |
| download | rails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.gz rails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.bz2 rails-ab14e3f8628da81535c09eab3ba48d06725c6769.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/actionpack.gemspec | 31 | ||||
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 2 |
2 files changed, 16 insertions, 17 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index dc91fba64d..2017776661 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -1,26 +1,25 @@ Gem::Specification.new do |s| - s.platform = Gem::Platform::RUBY - s.name = 'actionpack' - s.version = '3.0.pre' - s.summary = "Web-flow and rendering framework putting the VC in MVC." - s.description = %q{Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.} #' + s.platform = Gem::Platform::RUBY + s.name = 'actionpack' + s.version = '3.0.0.beta' + s.summary = 'Web-flow and rendering framework putting the VC in MVC (part of Rails).' + s.description = 'Web-flow and rendering framework putting the VC in MVC (part of Rails).' - s.author = "David Heinemeier Hansson" - s.email = "david@loudthinking.com" - s.rubyforge_project = "actionpack" - s.homepage = "http://www.rubyonrails.org" + s.author = 'David Heinemeier Hansson' + s.email = 'david@loudthinking.com' + s.homepage = 'http://www.rubyonrails.org' + s.rubyforge_project = 'actionpack' - s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*'] - s.has_rdoc = true + s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*'] + s.require_path = 'lib' s.requirements << 'none' - s.add_dependency('activesupport', '= 3.0.pre') - s.add_dependency('activemodel', '= 3.0.pre') + s.has_rdoc = true + + s.add_dependency('activesupport', '= 3.0.0.beta') + s.add_dependency('activemodel', '= 3.0.0.beta') s.add_dependency('rack', '~> 1.1.0') s.add_dependency('rack-test', '~> 0.5.0') s.add_dependency('rack-mount', '~> 0.4.0') s.add_dependency('erubis', '~> 2.6.5') - - s.require_path = 'lib' - s.autorequire = 'action_controller' end diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index ed0cdf38ee..4dde21dd40 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -2,7 +2,7 @@ module ActionPack #:nodoc: module VERSION #:nodoc: MAJOR = 3 MINOR = 0 - TINY = "pre" + TINY = "0.beta" STRING = [MAJOR, MINOR, TINY].join('.') end |