From: Go MAEDA Date: Fri, 21 Dec 2018 02:26:58 +0000 (+0000) Subject: Merged r17769 from trunk to 4.0-stable (#30241). X-Git-Tag: 4.0.1~19 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b5985a88c9623d39ce9a721e3dfa2955f1dd8f5e;p=redmine.git Merged r17769 from trunk to 4.0-stable (#30241). git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17770 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/Gemfile b/Gemfile index 975c881e3..066ca22e7 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "mimemagic" gem "mail", "~> 2.7.1" gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" -gem "nokogiri", "~> 1.8.0" +gem "nokogiri", "~> 1.9.0" gem "i18n", "~> 0.7.0" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem