Merge pull request #21606 from Eric-Guo/master

Bundler tzinfo-data in windows, even first generated new app are Mac

Merge pull request #21606 from Eric-Guo/master
Bundler tzinfo-data in windows, even first generated new app are Mac
a5037642 · Rafael Mendonça França · 03e8bcc2 · 0949df04 · a5037642
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

railties/lib/rails/generators/rails/app/templates/Gemfile railties/lib/rails/generators/rails/app/templates/Gemfile +0 -2

未找到文件。
--- 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 -%>