diff options
| author | Luca Simone <info@lucasimone.info> | 2014-10-29 07:56:01 +0100 |
|---|---|---|
| committer | Luca Simone <info@lucasimone.info> | 2014-10-29 07:56:01 +0100 |
| commit | bf993fac57bb1cb69ec46d2bbc2f2752bcd844ae (patch) | |
| tree | f1be7e007a272490b0d114e04b47777890a5811a /railties | |
| parent | 6c3bc9697641ba29959ca191c45e2d4a39a23d34 (diff) | |
| download | rails-bf993fac57bb1cb69ec46d2bbc2f2752bcd844ae.tar.gz rails-bf993fac57bb1cb69ec46d2bbc2f2752bcd844ae.tar.bz2 rails-bf993fac57bb1cb69ec46d2bbc2f2752bcd844ae.zip | |
Added 'tzinfo-data' if we are using jruby
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 827039f144..5961f7515c 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -40,7 +40,7 @@ group :development, :test do <% end -%> end -<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%> +<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%> # Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw] +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] <% end -%> |