diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2010-04-04 17:34:23 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2010-04-04 17:34:23 +0100 |
| commit | 00884a59013a658082dab41da5ff41add31b8c43 (patch) | |
| tree | 666b862b08b04c7a3727ee22b2cd1a2561af4e52 /Gemfile | |
| parent | 48b2451142355b22de5f8130b3debdd4e53e2ba2 (diff) | |
| parent | 7d7e0627a0490b6b4ddb0ee5429264ccd46f1245 (diff) | |
| download | rails-00884a59013a658082dab41da5ff41add31b8c43.tar.gz rails-00884a59013a658082dab41da5ff41add31b8c43.tar.bz2 rails-00884a59013a658082dab41da5ff41add31b8c43.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2,7 +2,7 @@ path File.dirname(__FILE__) source 'http://rubygems.org' gem "arel", :git => "git://github.com/rails/arel.git" -gem "rails", "3.0.0.beta1" +gem "rails", "3.0.0.beta2" gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" @@ -11,7 +11,7 @@ group :mri do if RUBY_VERSION < '1.9' gem "system_timer" gem "ruby-debug", ">= 0.10.3" - elsif RUBY_VERSION < '1.9.2' + elsif RUBY_VERSION < '1.9.2' && !ENV['CI'] gem "ruby-debug19" end end |