From 1c434615b30a7ff479213723bb6c99c421916c6e Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sat, 23 May 2020 12:48:14 +0900
Subject: Fix workaround for Elasticsearch 7.x (#13828)

---
 config/initializers/chewy.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'config')

diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 18d2f18c1..8f54abf77 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -29,3 +29,22 @@ end
 # Mastodon is run with hidden services enabled, because
 # ElasticSearch is *not* supposed to be accessed through a proxy
 Faraday.ignore_env_proxy = true
+
+# Elasticsearch 7.x workaround
+Elasticsearch::Transport::Client.prepend Module.new {
+  def search(arguments = {})
+    arguments[:rest_total_hits_as_int] = true
+    super arguments
+  end
+}
+Elasticsearch::API::Indices::IndicesClient.prepend Module.new {
+  def create(arguments = {})
+    arguments[:include_type_name] = true
+    super arguments
+  end
+
+  def put_mapping(arguments = {})
+    arguments[:include_type_name] = true
+    super arguments
+  end
+}
-- 
cgit 


From 8e056bd82e6d838aa525ece7a2d3a1cbcee2bcfe Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sun, 24 May 2020 16:15:23 +0900
Subject: Fix csv upload (#13835)

---
 app/models/import.rb             | 2 +-
 config/initializers/paperclip.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/app/models/import.rb b/app/models/import.rb
index a7a0d8065..c78a04d07 100644
--- 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
index 0dd7f8cf8..ebb009065 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -111,3 +111,5 @@ else
     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 }
-- 
cgit