Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks

2020-05-25 14:01:16 +02:00 · 2020-05-25 14:01:16 +02:00 · f20dff451e
commit f20dff451e
parent aeb0875025 6783d544b2
9 changed files with 506 additions and 284 deletions
--- a/test/web/activity_pub/mrf/steal_emoji_policy_test.exs
+++ b/test/web/activity_pub/mrf/steal_emoji_policy_test.exs
@ -19,6 +19,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicyTest do
    File.mkdir!(emoji_path)

    Pleroma.Emoji.reload()
+
+    on_exit(fn ->
+      File.rm_rf!(emoji_path)
+    end)
+
+    :ok
  end

  test "does nothing by default" do