Merge branch 'develop' into gun

diff --cc CHANGELOG.md
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/API/admin_api.md
Simple merge

diff --cc mix.exs
Simple merge

diff --cc test/notification_test.exs
Simple merge

diff --cc test/support/http_request_mock.ex
Simple merge

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge

diff --cc test/web/mastodon_api/views/notification_view_test.exs
index ac3e126179fae9fc1b3a1883e16755df672de02a,7965af00ac97821755c4a3b14ee0d53aaaa44580..81eefd7350d839078ba09793eb127061a3f041b2
--- 1/test/web/mastodon_api/views/notification_view_test.exs
--- 2/test/web/mastodon_api/views/notification_view_test.exs
+++ b/test/web/mastodon_api/views/notification_view_test.exs
@@@ -104,11 -109,9 +109,10 @@@ defmodule Pleroma.Web.MastodonAPI.Notif
      User.perform(:delete, follower)
      notification = Notification |> Repo.one() |> Repo.preload(:activity)
  
-     assert [] ==
-              NotificationView.render("index.json", %{notifications: [notification], for: followed})
+     test_notifications_rendering([notification], followed, [])
    end
  
 +  @tag capture_log: true
    test "Move notification" do
      old_user = insert(:user)
      new_user = insert(:user, also_known_as: [old_user.ap_id])

diff --cc test/web/mastodon_api/views/status_view_test.exs
Simple merge