From: Go MAEDA <maeda@farend.jp>
Date: Sun, 24 Jan 2021 03:56:12 +0000 (+0000)
Subject: Merged r20722 from trunk to 4.1-stable (#34619).
X-Git-Tag: 4.1.2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=17b6e61d5ba61fa7ca3a817f9008e22ac478c18b;p=redmine.git

Merged r20722 from trunk to 4.1-stable (#34619).


git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20723 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 317f70597..172b9d322 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")
 gem "mimemagic"
 gem "mail", "~> 2.7.1"
 gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
-gem "nokogiri", "~> 1.10.0"
+gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
 gem "i18n", "~> 1.6.0"
 gem "rbpdf", "~> 1.20.0"