Merge branch 'relay-fix-admin-fe' into 'develop'

Relay fix for admin-fe See merge request pleroma/pleroma!2902
2020-08-24 17:03:18 +00:00 · 2020-08-24 17:03:18 +00:00 · d39abd02ac
commit d39abd02ac
parent e1c8c599ff 13f6029b4b
13 changed files with 149 additions and 97 deletions
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@ -533,7 +533,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
      end)

      :ok = Mix.Tasks.Pleroma.Relay.run(["list"])
-      assert_receive {:mix_shell, :info, ["relay.mastodon.host"]}
+      assert_receive {:mix_shell, :info, ["https://relay.mastodon.host/actor"]}
    end

    @tag capture_log: true