Fix csv upload (mastodon#13835)

hachyderm · May 24, 2020 · 8e056bd · 8e056bd
1 parent 51d8964
commit 8e056bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/models/import.rb b/app/models/import.rb
@@ -17,7 +17,7 @@
 #
 
 class Import < ApplicationRecord
-  FILE_TYPES = %w(text/plain text/csv).freeze
+  FILE_TYPES = %w(text/plain text/csv application/csv).freeze
   MODES = %i(merge overwrite).freeze
 
   self.inheritance_column = false

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
@@ -111,3 +111,5 @@
     url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
   )
 end
+
+Paperclip.options[:content_type_mappings] = { csv: Import::FILE_TYPES }
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,3 +111,5 @@ @@
         url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
       )
     end
+    Paperclip.options[:content_type_mappings] = { csv: Import::FILE_TYPES }