diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-12 15:07:11 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-12 15:07:11 -0300 |
| commit | 76fcbf3ebe5b29004c1122d3d73b6d62a976715b (patch) | |
| tree | 61662665cf5a26959ae9c32e4a39015af4501856 /railties/lib | |
| parent | 711a882f106385e248135c84ea9a6a827f0bd1e1 (diff) | |
| parent | c8ccab05277dd5639cea509c2911af6ee35b0cf9 (diff) | |
| download | rails-76fcbf3ebe5b29004c1122d3d73b6d62a976715b.tar.gz rails-76fcbf3ebe5b29004c1122d3d73b6d62a976715b.tar.bz2 rails-76fcbf3ebe5b29004c1122d3d73b6d62a976715b.zip | |
Merge pull request #14720 from philr/tzinfo_data_x64_mingw
Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 756c334772..448b6f4845 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/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 -%> |