Merge pull request #81 from activeadmin-plugins/Fivell-patch-3

Fivell · Fivell · commit 225126c87ab1 · 2015-11-24T16:13:41.000+02:00
added new supported content type
diff --git a/lib/active_admin_import/model.rb b/lib/active_admin_import/model.rb
@@ -101,10 +101,12 @@ def csv_allowed_types
       [
           'text/csv',
           'text/x-csv',
+          'text/x-comma-separated-values',
           'text/comma-separated-values',
           'application/csv',
           'application/vnd.ms-excel',
-          'application/vnd.msexcel'
+          'application/vnd.msexcel',
+          
       ]
     end
 

Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,12 @@ def csv_allowed_types`
`101`	`101`	`[`
`102`	`102`	`'text/csv',`
`103`	`103`	`'text/x-csv',`
	`104`	`+ 'text/x-comma-separated-values',`
`104`	`105`	`'text/comma-separated-values',`
`105`	`106`	`'application/csv',`
`106`	`107`	`'application/vnd.ms-excel',`
`107`		`- 'application/vnd.msexcel'`
	`108`	`+ 'application/vnd.msexcel',`
	`109`	`+`
`108`	`110`	`]`
`109`	`111`	`end`
`110`	`112`