diff options
author | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
commit | 01ae99c681d31803f3a29f8305c9a041aa456660 (patch) | |
tree | 7fdb9e32b743aeb254854371349cecfd2499defa /Gemfile | |
parent | d002826e54415a340e55fdbf363d005faebf8fc5 (diff) | |
parent | fca32eb6c5b41e4f19a25b7b246c4a8a3d763667 (diff) | |
download | rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.gz rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.bz2 rails-01ae99c681d31803f3a29f8305c9a041aa456660.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 51 |
1 files changed, 34 insertions, 17 deletions
@@ -1,21 +1,38 @@ -Gem.sources.each { |uri| source uri } +clear_sources +source 'http://gemcutter.org' + +gem "rake", ">= 0.8.7" +gem "mocha", ">= 0.9.8" gem "rails", "3.0.pre", :vendored_at => "railties" -%w( - activesupport - activemodel - actionpack - actionmailer - activerecord - activeresource -).each do |lib| +%w(activesupport activemodel actionpack actionmailer activerecord activeresource).each do |lib| gem lib, '3.0.pre', :vendored_at => lib end -gem "rack", "1.0.1" -gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" -gem "rack-test", "~> 0.5.0" -gem "erubis", "~> 2.6.0" -gem "arel", :git => "git://github.com/rails/arel.git" -gem "mocha" -gem "sqlite3-ruby" -gem "RedCloth" + +# AR +gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" +gem "sqlite3-ruby", ">= 1.2.5" + +# AP +gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" +gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" +gem "rack-test", ">= 0.5.0" +gem "erubis", ">= 2.6.5" +gem "RedCloth", ">= 4.2.2" + +if ENV['CI'] + disable_system_gems + + gem "nokogiri", ">= 1.4.0" + gem "memcache-client", ">= 1.7.6" + gem "pg", ">= 0.8.0" + gem "mysql", ">= 2.8.1" + + # fcgi gem doesn't compile on 1.9 + # avoid minitest strangeness on 1.9 + if RUBY_VERSION < '1.9.0' + gem "fcgi", ">= 0.8.7" + else + gem "test-unit", ">= 2.0.5" + end +end |