Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

2020-05-15 13:33:04 +02:00 · 2020-05-15 13:33:04 +02:00 · f012c3a202
commit f012c3a202
parent 1d18721a3c 081d1d3f48
38 changed files with 1317 additions and 233 deletions
--- a/test/web/mastodon_api/controllers/search_controller_test.exs
+++ b/test/web/mastodon_api/controllers/search_controller_test.exs
@ -13,7 +13,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
  import Tesla.Mock
  import Mock

-  setup do
+  setup_all do
    mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
    :ok
  end