From: Go MAEDA <maeda@farend.jp>
Date: Tue, 19 Feb 2019 10:11:07 +0000 (+0000)
Subject: Drop Ruby 2.2 support (#30356).
X-Git-Tag: 4.1.0~1104
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=158392ae930b04d3642f224da3c33cb5f2801435;p=redmine.git

Drop Ruby 2.2 support (#30356).


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

diff --git a/Gemfile b/Gemfile
index 83f488415..7335c5bd9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,8 +10,8 @@ gem "actionpack-xml_parser"
 gem "roadie-rails", "~> 1.3.0"
 gem "mimemagic"
 gem "mail", "~> 2.7.1"
-gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
-gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
+gem "csv", "~> 3.0.1" if RUBY_VERSION < "2.6"
+gem "nokogiri", "~> 1.10.0"
 gem "i18n", "~> 0.7.0"
 gem "rbpdf", "~> 1.19.6"
 
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 7f6a512f6..3d7e406fa 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -50,8 +50,7 @@ class ImportsController < ApplicationController
       redirect_to import_mapping_path(@import)
     end
 
-  # TODO: Remove ArgumentError when support for Ruby 2.2 is dropped (#28689)
-  rescue CSV::MalformedCSVError, ArgumentError, EncodingError => e
+  rescue CSV::MalformedCSVError, EncodingError => e
     if e.is_a?(CSV::MalformedCSVError) && e.message !~ /Invalid byte sequence/
       flash.now[:error] = l(:error_invalid_csv_file_or_settings)
     else
diff --git a/doc/INSTALL b/doc/INSTALL
index 60fdcb367..34e1a097d 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby >= 2.2.2
+* Ruby >= 2.3
 * RubyGems
 * Bundler >= 1.5.0