aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorEric Guo <eric.guo@sandisk.com>2015-09-13 10:25:29 +0800
committerEric Guo <eric.guo@sandisk.com>2015-09-15 09:37:23 +0800
commit0949df04f8d3d01ee9e2ffc82ca1ad9eb19c3190 (patch)
tree17df698e6cd825765e03dea9104be7b08d6e5965 /railties/lib
parent29886d93048a4719872e228894559b477f87a278 (diff)
downloadrails-0949df04f8d3d01ee9e2ffc82ca1ad9eb19c3190.tar.gz
rails-0949df04f8d3d01ee9e2ffc82ca1ad9eb19c3190.tar.bz2
rails-0949df04f8d3d01ee9e2ffc82ca1ad9eb19c3190.zip
Bundler tzinfo-data in windows, even first generated new app are Mac
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile2
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 -%>