diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
commit | e68bfaf1fe1a7890a67af6f444281185f507cf9e (patch) | |
tree | 5e73caccdcdd65d0ac97f9eb92195928f30925f2 /rails.gemspec | |
parent | ef6462c73003b28c8e060a06120abb9cd67b6d52 (diff) | |
parent | 16846553b8866eab2aa3b128a2a23a221a25f7e3 (diff) | |
download | rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.gz rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.bz2 rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.zip |
Merge remote branch 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
railties/lib/rails/configuration.rb
railties/lib/rails/log_subscriber.rb
Diffstat (limited to 'rails.gemspec')
-rw-r--r-- | rails.gemspec | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/rails.gemspec b/rails.gemspec index 1460dd5688..8b9a374e25 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -1,10 +1,13 @@ +version = File.read(File.expand_path("../RAILS_VERSION",__FILE__)).strip + Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'rails' - s.version = '3.0.0.beta1' - s.summary = 'Full-stack web-application framework.' - s.description = 'Full-stack web-application framework.' + s.version = version + s.summary = 'Full-stack web application framework.' + s.description = 'Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.' s.required_ruby_version = '>= 1.8.7' + s.required_rubygems_version = ">= 1.3.6" s.author = 'David Heinemeier Hansson' s.email = 'david@loudthinking.com' @@ -14,11 +17,11 @@ Gem::Specification.new do |s| s.files = [] s.require_path = [] - s.add_dependency('activesupport', '= 3.0.0.beta1') - s.add_dependency('actionpack', '= 3.0.0.beta1') - s.add_dependency('activerecord', '= 3.0.0.beta1') - s.add_dependency('activeresource', '= 3.0.0.beta1') - s.add_dependency('actionmailer', '= 3.0.0.beta1') - s.add_dependency('railties', '= 3.0.0.beta1') - s.add_dependency('bundler', '>= 0.9.3') + s.add_dependency('activesupport', version) + s.add_dependency('actionpack', version) + s.add_dependency('activerecord', version) + s.add_dependency('activeresource', version) + s.add_dependency('actionmailer', version) + s.add_dependency('railties', version) + s.add_dependency('bundler', '>= 0.9.8') end |