Permalink
Browse files

Merge pull request #14720 from philr/tzinfo_data_x64_mingw

Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).
  • Loading branch information...
2 parents 711a882 + c8ccab0 commit 76fcbf3ebe5b29004c1122d3d73b6d62a976715b @rafaelfranca rafaelfranca committed Apr 12, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -33,5 +33,5 @@ source 'https://rubygems.org'
<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%>
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin]
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
<% end -%>

0 comments on commit 76fcbf3

Please sign in to comment.