summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-01-24 03:56:12 +0000
committerGo MAEDA <maeda@farend.jp>2021-01-24 03:56:12 +0000
commit17b6e61d5ba61fa7ca3a817f9008e22ac478c18b (patch)
tree4fecb244d93c025506ac54afe3259cccaaa5f0d7 /Gemfile
parentdb4f8323dc114e7c3e2d1c8d3cdd40040fdb81a1 (diff)
downloadredmine-17b6e61d5ba61fa7ca3a817f9008e22ac478c18b.tar.gz
redmine-17b6e61d5ba61fa7ca3a817f9008e22ac478c18b.zip
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
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"