stable release #160

Merged
floatingghost merged 111 commits from develop into stable 2022-08-12 15:25:02 +00:00
2 changed files with 1 additions and 10 deletions
Showing only changes of commit 456c97fda9 - Show all commits

View File

@ -83,13 +83,4 @@ defmodule Pleroma.HTTP do
|> Builder.add_param(:query, :query, params)
|> Builder.convert_to_keyword()
end
defp adapter_middlewares(_) do
if Pleroma.Config.get(:env) == :test do
# Emulate redirects in test env, which are handled by adapters in other environments
[Tesla.Middleware.FollowRedirects]
else
[]
end
end
end

View File

@ -344,7 +344,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
assert not called(
Pleroma.Web.Federator.Publisher.enqueue_one(Publisher, %{
inbox: "https://rejected.com/users/nick1/inbox",
inbox: "https://rejected.com/users/nick2/inbox",
actor_id: actor.id,
id: public_note_activity.data["id"]
})