diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
| commit | 7f07cc364a7ee7ceae21b29b54467fde0db93389 (patch) | |
| tree | 7c9dd8aaeda68731756ee108a8318239b04c80f0 /Gemfile | |
| parent | b9fcd8d71f94702463b97545bb70ce4727c5b47e (diff) | |
| parent | 61001e766de974a8864c0bc2cf915888d277a0ea (diff) | |
| download | rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.gz rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.bz2 rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -6,17 +6,18 @@ gem "rails", :path => File.dirname(__FILE__) gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" -group :mri do +mri = !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" +if mri && RUBY_VERSION < '1.9' + gem "system_timer" + gem "ruby-debug", ">= 0.10.3" +end + +if mri || RUBY_ENGINE == "rbx" gem 'json' gem 'yajl-ruby' gem "nokogiri", ">= 1.4.0" - - if RUBY_VERSION < '1.9' - gem "system_timer" - gem "ruby-debug", ">= 0.10.3" - elsif RUBY_VERSION < '1.9.2' && !ENV['CI'] - gem "ruby-debug19" - end +elsif RUBY_ENGINE == "jruby" + gem "jruby-debug" end # AR |