diff options
Diffstat (limited to 'app/controllers')
| -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 |