File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed
Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -23,8 +23,8 @@ group :test do
2323 gem 'pry'
2424 gem 'database_cleaner'
2525 gem 'capybara'
26- gem 'selenium-webdriver'
2726 gem 'poltergeist'
27+ gem 'selenium-webdriver' , '< 3.0' , platforms : :ruby_19
2828 gem 'json' , '< 2.0' , platforms : :ruby_19 # Json 2.0 requires Ruby >= 2.0
2929 gem 'mime-types' , '< 3.0.0' , platforms : [ :ruby_19 , :ruby_20 ]
3030 gem 'tins' , '< 1.3.4' , platforms : :ruby_19
Original file line number Diff line number Diff line change 22# frozen_string_literal: true
33
44require 'rchardet'
5+ require 'zip'
56
67module ActiveAdminImport
78 class Model
@@ -14,7 +15,7 @@ module CONST
1415 TMP_FILE = 'active-admin-import-unzipped' . freeze
1516 CSV_TYPES = %w(
1617 text/csv
17- text/csv
18+ text/x- csv
1819 text/x-comma-separated-values
1920 text/comma-separated-values
2021 application/csv
You can’t perform that action at this time.
0 commit comments