From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 16 Dec 2021 16:13:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=415d9dd6f6887af96d85cfb2c306b94bb8a1a42f;p=akkoma

Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
---

415d9dd6f6887af96d85cfb2c306b94bb8a1a42f
diff --cc lib/pleroma/elasticsearch/store.ex
index aa5e2b104,5c9e15022..7f6ef37a9
--- a/lib/pleroma/elasticsearch/store.ex
+++ b/lib/pleroma/elasticsearch/store.ex
@@@ -95,12 -108,6 +108,7 @@@ defmodule Pleroma.Elasticsearch d
        )
    end
  
-   def maybe_bulk_post(data, type) do
-     if enabled?() do
-       bulk_post(data, type)
-     end
-   end
 +
    def bulk_post(data, :users) do
      d =
        data