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

diff --cc CHANGELOG.md
Simple merge

diff --cc test/web/twitter_api/util_controller_test.exs
index 349122c056981154dc7bd1a4219e11f2c0076a81,cf8e69d2b4e61f46af7e140164bf9d2631d8d8b2..5a3ae53aa60c4acada2d78fe8caa0e314c3927cf
--- 1/test/web/twitter_api/util_controller_test.exs
--- 2/test/web/twitter_api/util_controller_test.exs
+++ b/test/web/twitter_api/util_controller_test.exs
@@@ -4,11 -4,8 +4,10 @@@
  
  defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
    use Pleroma.Web.ConnCase
 +  use Oban.Testing, repo: Pleroma.Repo
  
-   alias Pleroma.Notification
    alias Pleroma.Repo
 +  alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.Web.CommonAPI
    import Pleroma.Factory