Merge branch 'develop' into gun

2020-03-20 20:47:54 +03:00 · 2020-03-20 20:47:54 +03:00 · 9bae9b1b1b
commit 9bae9b1b1b
parent 51ce0813d3 d74405fc1a
108 changed files with 1075 additions and 390 deletions
--- a/test/web/activity_pub/relay_test.exs
+++ b/test/web/activity_pub/relay_test.exs
@ -68,7 +68,7 @@ defmodule Pleroma.Web.ActivityPub.RelayTest do
  end

  describe "publish/1" do
-    clear_config([:instance, :federating])
+    setup do: clear_config([:instance, :federating])

    test "returns error when activity not `Create` type" do
      activity = insert(:like_activity)