Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #10826 from sferik/update_tzinfo

Update tzinfo
  • Loading branch information...
commit dbc6ce3d6f2580df41fee4f4a663f5a81943de20 2 parents 281f488 + 9d664b1
@pixeltrix pixeltrix authored
View
2  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
View
5 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 -%>
Please sign in to comment.
Something went wrong with that request. Please try again.