aboutsummaryrefslogtreecommitdiffstats
path: root/railties/Rakefile
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-07-03 13:01:39 +0100
committerPratik Naik <pratiknaik@gmail.com>2009-07-03 13:01:39 +0100
commit2fe263bb328c20539f2970057f31e567ec4ab7c8 (patch)
tree63e85164fb09aca6beb78e1a5c52424fa49ed098 /railties/Rakefile
parentbf5ac9965f12840d469ef2a4a16e8205dbbe5253 (diff)
parenta4bdc00fec623f72592e663e6d7830eea0bc6ea4 (diff)
downloadrails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.gz
rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.bz2
rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.zip
Merge commit 'mainstream/master'
Conflicts: actionpack/lib/action_controller.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_view/template/path.rb activesupport/lib/active_support/json/encoders/hash.rb
Diffstat (limited to 'railties/Rakefile')
-rw-r--r--railties/Rakefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index 69c1ca762a..61c094150a 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -316,11 +316,11 @@ spec = Gem::Specification.new do |s|
EOF
s.add_dependency('rake', '>= 0.8.3')
- s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD)
- s.add_dependency('activerecord', '= 2.3.2' + PKG_BUILD)
- s.add_dependency('actionpack', '= 2.3.2' + PKG_BUILD)
- s.add_dependency('actionmailer', '= 2.3.2' + PKG_BUILD)
- s.add_dependency('activeresource', '= 2.3.2' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 3.0.pre' + PKG_BUILD)
+ s.add_dependency('activerecord', '= 3.0.pre' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 3.0.pre' + PKG_BUILD)
+ s.add_dependency('actionmailer', '= 3.0.pre' + PKG_BUILD)
+ s.add_dependency('activeresource', '= 3.0.pre' + PKG_BUILD)
s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false