From: Go MAEDA <maeda@farend.jp>
Date: Tue, 28 Jul 2020 13:10:49 +0000 (+0000)
Subject: Bundler may fail to install stringio if Ruby prior to 2.5 is used (#33768).
X-Git-Tag: 4.2.0~862
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=39d395b72737c9b22af4e2306283f9cc588afa50;p=redmine.git

Bundler may fail to install stringio if Ruby prior to 2.5 is used (#33768).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19938 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index d11f085d0..b31d10581 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "actionpack-xml_parser"
 gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")
 gem "mimemagic"
 gem "mail", "~> 2.7.1"
-gem "csv", "~> 3.1.1"
+gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
 gem "nokogiri", "~> 1.10.0"
 gem 'i18n', '~> 1.8.2'
 gem "rbpdf", "~> 1.20.0"