Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts: # CHANGELOG.md
2020-10-28 19:03:40 +03:00 · 2020-10-28 19:03:40 +03:00 · ba50dc05a8
commit ba50dc05a8
parent d54233760f 342c2e1bc0
54 changed files with 629 additions and 183 deletions
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@ -22,7 +22,8 @@ defmodule Pleroma.Web.ConnCase do
  using do
    quote do
      # Import conveniences for testing with connections
-      use Phoenix.ConnTest
+      import Plug.Conn
+      import Phoenix.ConnTest
      use Pleroma.Tests.Helpers
      import Pleroma.Web.Router.Helpers