diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-25 21:12:00 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-25 21:12:00 -0800 |
| commit | 92aa789ce1ee9d7a2220bb49d22288f292d05367 (patch) | |
| tree | 657d7aa6521938c69d5f95444aa290803a95088d | |
| parent | 30859a0bfda5608e1b8ed340a0c4e8574fa609b8 (diff) | |
| parent | 066ae49fb7af3679c163c070515388357ee91ba9 (diff) | |
| download | rails-92aa789ce1ee9d7a2220bb49d22288f292d05367.tar.gz rails-92aa789ce1ee9d7a2220bb49d22288f292d05367.tar.bz2 rails-92aa789ce1ee9d7a2220bb49d22288f292d05367.zip | |
Merge pull request #9429 from frodsan/racc_jruby_incompatibility
JRuby does not support racc, include it only in ruby platform
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -9,9 +9,6 @@ gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0.beta1' -# Needed for compiling the ActionDispatch::Journey parser -gem 'racc', '>=1.4.6', require: false - # This needs to be with require false to avoid # it being automatically loaded by sprockets gem 'uglifier', require: false @@ -41,6 +38,9 @@ platforms :ruby do gem 'yajl-ruby' gem 'nokogiri', '>= 1.4.5' + # Needed for compiling the ActionDispatch::Journey parser + gem 'racc', '>=1.4.6', require: false + # AR gem 'sqlite3', '~> 1.3.6' |