diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-15 00:32:01 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-15 00:32:01 -0300 |
| commit | a50376424f9e72eba0d816ca303034ce03b6fe84 (patch) | |
| tree | 05a21994ab07f1bb1559f158764cb0f3072e7fba | |
| parent | 03e8bcc242e69413a765619892995c952e1fef06 (diff) | |
| parent | 0949df04f8d3d01ee9e2ffc82ca1ad9eb19c3190 (diff) | |
| download | rails-a50376424f9e72eba0d816ca303034ce03b6fe84.tar.gz rails-a50376424f9e72eba0d816ca303034ce03b6fe84.tar.bz2 rails-a50376424f9e72eba0d816ca303034ce03b6fe84.zip | |
Merge pull request #21606 from Eric-Guo/master
Bundler tzinfo-data in windows, even first generated new app are Mac
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 6a1c2faaab..975be07622 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -50,8 +50,6 @@ group :development do <% end -%> end <% end -%> -<% 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, :jruby] -<% end -%> |