diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-11-10 05:39:54 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-11-10 05:39:54 -0800 |
| commit | dbc6ce3d6f2580df41fee4f4a663f5a81943de20 (patch) | |
| tree | 5b35e1e4d03d6aec1a3cc26e62b8ded8beb6118b | |
| parent | 281f488fffc176084bf77c3ba5b1f1c4d6ab5680 (diff) | |
| parent | 9d664b18df7a81b75e45bb99858f920de040e9fb (diff) | |
| download | rails-dbc6ce3d6f2580df41fee4f4a663f5a81943de20.tar.gz rails-dbc6ce3d6f2580df41fee4f4a663f5a81943de20.tar.bz2 rails-dbc6ce3d6f2580df41fee4f4a663f5a81943de20.zip | |
Merge pull request #10826 from sferik/update_tzinfo
Update tzinfo
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index ffc2c2074e..c27c50e47b 100644 --- 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 index 21dcba7947..68bd62d4b1 100644 --- 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 -%> |