Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
index be9ff2568e1c99c7b8a344f3dcc84d84aae820d3,2febe8b3a395591b1ef6e5ee4cec71b90c7147fb..f18b58a1bf4c86a0f95cda7e0ce01a59d5d60c4e
--- 1/test/web/mastodon_api/mastodon_api_controller_test.exs
--- 2/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@@ -3936,11 -3937,9 +3939,11 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
        |> post("/api/v1/pleroma/accounts/confirmation_resend?email=#{user.email}")
        |> json_response(:no_content)
  
 +      ObanHelpers.perform_all()
 +
        email = Pleroma.Emails.UserEmail.account_confirmation_email(user)
-       notify_email = Pleroma.Config.get([:instance, :notify_email])
-       instance_name = Pleroma.Config.get([:instance, :name])
+       notify_email = Config.get([:instance, :notify_email])
+       instance_name = Config.get([:instance, :name])
  
        assert_email_sent(
          from: {instance_name, notify_email},