[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...

# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs

diff --cc CHANGELOG.md
Simple merge

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

diff --cc test/notification_test.exs
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge

diff --cc test/web/twitter_api/twitter_api_test.exs
index bf063a0dec5307d93a750c89427d4155a5b5661d,c5b18234e092a7a7a6f335497d786411f2bbe457..3c0528776d669f22915be26e6ea65c2ec2457539
--- 1/test/web/twitter_api/twitter_api_test.exs
--- 2/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@@ -4,18 -4,11 +4,12 @@@
  
  defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
    use Pleroma.DataCase
-   alias Pleroma.Activity
-   alias Pleroma.Object
    alias Pleroma.Repo
 +  alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.UserInviteToken
-   alias Pleroma.Web.ActivityPub.ActivityPub
-   alias Pleroma.Web.TwitterAPI.ActivityView
+   alias Pleroma.Web.MastodonAPI.AccountView
    alias Pleroma.Web.TwitterAPI.TwitterAPI
-   alias Pleroma.Web.TwitterAPI.UserView
- 
-   import Pleroma.Factory
  
    setup_all do
      Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)