diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-29 16:12:19 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-29 16:12:19 -0300 |
| commit | d233220f2921472c85142137d63f42d2d728adaa (patch) | |
| tree | 0a6f0ec324cde4c4245caf50fa741edc97286485 /railties | |
| parent | 156c6577313ca4183c72423bab5ffd24c1b9353d (diff) | |
| parent | 31f3167be0118bb2b25e88c394f81b321146e52e (diff) | |
| download | rails-d233220f2921472c85142137d63f42d2d728adaa.tar.gz rails-d233220f2921472c85142137d63f42d2d728adaa.tar.bz2 rails-d233220f2921472c85142137d63f42d2d728adaa.zip | |
Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfile
plugin's gemfile also needs tzinfo-data in Windows
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/Gemfile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/templates/Gemfile b/railties/lib/rails/generators/rails/plugin/templates/Gemfile index ab8b8925eb..84cef9525e 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/Gemfile +++ b/railties/lib/rails/generators/rails/plugin/templates/Gemfile @@ -45,3 +45,7 @@ end # gem 'byebug', group: [:development, :test] <%- end -%> <% end -%> + +<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%> +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +<% end -%> |