diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-19 15:43:13 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-19 15:43:13 -0200 |
| commit | da2987afc9b1a03899304c0ea24a1dec395d39b8 (patch) | |
| tree | b8a2e10fa62fdf706b01ce3421ee740e174d6da3 /railties/lib | |
| parent | 108fcbc6dace8bf83a783f8d2fdd42711586882d (diff) | |
| parent | 740c0f058d5f5fc9735a1075e9c9313fe946cf8b (diff) | |
| download | rails-da2987afc9b1a03899304c0ea24a1dec395d39b8.tar.gz rails-da2987afc9b1a03899304c0ea24a1dec395d39b8.tar.bz2 rails-da2987afc9b1a03899304c0ea24a1dec395d39b8.zip | |
Merge pull request #19005 from meganemura/remove-last-empty-line-in-gemfile
Remove last empty line when we don't use Windows or JRuby
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/Gemfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 143673f711..82a0315379 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -42,8 +42,8 @@ group :development, :test do gem 'method_source' <% end -%> end - <% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%> + # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] <% end -%> diff --git a/railties/lib/rails/generators/rails/plugin/templates/Gemfile b/railties/lib/rails/generators/rails/plugin/templates/Gemfile index f325455bac..2c91c6a0ea 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/Gemfile +++ b/railties/lib/rails/generators/rails/plugin/templates/Gemfile @@ -41,7 +41,7 @@ end # To use a debugger # gem 'byebug', group: [:development, :test] <% end -%> - <% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%> + gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] <% end -%> |