diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-02-19 10:11:07 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-02-19 10:11:07 +0000 |
| commit | 158392ae930b04d3642f224da3c33cb5f2801435 (patch) | |
| tree | 0e0c8cd8311f1882940218c565d36a6276e27479 /app | |
| parent | 1e54627a309d7fba80da89469b62725dd9a05318 (diff) | |
| download | redmine-158392ae930b04d3642f224da3c33cb5f2801435.tar.gz redmine-158392ae930b04d3642f224da3c33cb5f2801435.zip | |
Drop Ruby 2.2 support (#30356).
git-svn-id: http://svn.redmine.org/redmine/trunk@17887 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/imports_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |