vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix csv upload (#13835)

Browse source
This commit is contained in:
Takeshi Umeda 2020-05-24 16:15:23 +09:00 committed by GitHub
parent 51d8964b93
commit 8e056bd82e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/import.rb
View file

@ -17,7 +17,7 @@
# #
class Import < ApplicationRecord 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 MODES = %i(merge overwrite).freeze
self.inheritance_column = false self.inheritance_column = false

2
config/initializers/paperclip.rb
View file

@ -111,3 +111,5 @@ else
url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename', url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
) )
end end
Paperclip.options[:content_type_mappings] = { csv: Import::FILE_TYPES }