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 83f488415161ebe54f03b39c43b0c537ac4c5aed..7335c5bd9fddbdfdb4f4e60ebe5d382b155a21c7 100644 (file)
--- 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 7f6a512f6b4755647a989b81269c83f1b8d8f486..3d7e406fafb4b3071c586e9228036e6000aa6a81 100644 (file)
--- 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 60fdcb36722daf98eba157999b859977a8040ae3..34e1a097d552e58b0bc760c8e83cbcbcf5c2b48b 100644 (file)
--- 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