diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-10-29 09:55:01 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-10-29 09:55:01 -0200 |
| commit | 76bec5939c4855f7522ada2f38409357778810ce (patch) | |
| tree | 5f8526907b2939da2b78a3b9524e561af78c7ce0 | |
| parent | 82ce157844f38ac144e2185786f8875df07a7a37 (diff) | |
| parent | bf993fac57bb1cb69ec46d2bbc2f2752bcd844ae (diff) | |
| download | rails-76bec5939c4855f7522ada2f38409357778810ce.tar.gz rails-76bec5939c4855f7522ada2f38409357778810ce.tar.bz2 rails-76bec5939c4855f7522ada2f38409357778810ce.zip | |
Merge pull request #17423 from lukefx/jruby_windows_tzinfo
Added 'tzinfo-data' if we are using jruby
| -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 -%> |