Merge pull request #10826 from sferik/update_tzinfo

Update tzinfo
rails · Nov 10, 2013 · dbc6ce3 · dbc6ce3
2 parents 281f488 + 9d664b1
commit dbc6ce3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('i18n',       '~> 0.6', '>= 0.6.4')
   s.add_dependency 'json',       '~> 1.7'
-  s.add_dependency 'tzinfo',     '~> 0.3.37'
+  s.add_dependency 'tzinfo',     '~> 1.1'
   s.add_dependency 'minitest',   '~> 5.0'
   s.add_dependency 'thread_safe','~> 0.1'
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -28,3 +28,8 @@ source 'https://rubygems.org'
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 <% end -%>
+
+<% 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]
+<% end -%>