diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-14 09:53:57 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-14 09:53:57 -0800 |
| commit | 2088f1b3b4538fc7cac0d7bb23bdfba592438a1d (patch) | |
| tree | b51e846c4033e89ca764082bbf9f3588d1c389fc /railties/lib | |
| parent | 1df22bbb0ff5dcfba45a3e9869cac2ecca868d9c (diff) | |
| parent | 49cd6a0ff7a3f5b0e85707961c952bdc3b0a178f (diff) | |
| download | rails-2088f1b3b4538fc7cac0d7bb23bdfba592438a1d.tar.gz rails-2088f1b3b4538fc7cac0d7bb23bdfba592438a1d.tar.bz2 rails-2088f1b3b4538fc7cac0d7bb23bdfba592438a1d.zip | |
Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile
Added therubyrhino to default Gemfile under JRuby
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 0a79d6e86e..3fbde0d989 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -199,6 +199,7 @@ module Rails group :assets do gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git' gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git' + #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)} gem 'uglifier', '>= 1.0.3' end GEMFILE |