diff options
| author | Erik Michaels-Ober <sferik@gmail.com> | 2013-11-10 06:51:14 -0500 |
|---|---|---|
| committer | Erik Michaels-Ober <sferik@gmail.com> | 2013-11-10 06:52:16 -0500 |
| commit | 9d664b18df7a81b75e45bb99858f920de040e9fb (patch) | |
| tree | 5b35e1e4d03d6aec1a3cc26e62b8ded8beb6118b /railties/lib | |
| parent | 281f488fffc176084bf77c3ba5b1f1c4d6ab5680 (diff) | |
| download | rails-9d664b18df7a81b75e45bb99858f920de040e9fb.tar.gz rails-9d664b18df7a81b75e45bb99858f920de040e9fb.tar.bz2 rails-9d664b18df7a81b75e45bb99858f920de040e9fb.zip | |
Update tzinfo dependency to ~> 1.1
Include the tzinfo-data in the generated Gemfile on Windows.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 5 |
1 files changed, 5 insertions, 0 deletions
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 -%> |