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 /rails3b.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 'rails3b.gemspec')
| -rw-r--r-- | rails3b.gemspec | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rails3b.gemspec b/rails3b.gemspec index d67d20b884..613a248ef7 100644 --- a/rails3b.gemspec +++ b/rails3b.gemspec @@ -2,8 +2,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'rails3b' s.version = '3.0.1' - s.summary = 'Just the Rails 3 beta dependencies. Works around prerelease RubyGems bug.' - s.description = 'My kingdom for working dependencies.' + s.summary = 'Just the Rails 3 beta dependencies. Works around prerelease RubyGems bug in versions before 1.3.6.' s.required_ruby_version = '>= 1.8.7' s.author = 'Jeremy Kemper' @@ -22,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency('tzinfo', '~> 0.3.16') s.add_dependency('builder', '~> 2.1.2') s.add_dependency('memcache-client', '~> 1.7.5') - s.add_dependency('bundler', '>= 0.9.2') + s.add_dependency('bundler', '>= 0.9.8') s.add_dependency('rake', '>= 0.8.3') s.add_dependency('thor', '~> 0.13') end |