Merge branch 'develop' into feature/disable-account

diff --cc config/config.exs
Simple merge

diff --cc docs/api/pleroma_api.md
Simple merge

diff --cc lib/pleroma/notification.ex
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/router.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
Simple merge

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

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/twitter_api/util_controller_test.exs
index 0288e24d151b9fd3269dabae62f7f553fb193883,56474447b59cfa1cee948fffb39cb32829c48459..14a8225f097caac84a6c9de636e77357930fa36f
--- 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
@@@ -246,21 -246,9 +246,27 @@@ defmodule Pleroma.Web.TwitterAPI.UtilCo
      end
    end
  
+   test "GET /api/pleroma/healthcheck", %{conn: conn} do
+     conn = get(conn, "/api/pleroma/healthcheck")
+ 
+     assert conn.status in [200, 503]
+   end
++
 +  describe "POST /api/pleroma/disable_account" do
 +    test "it returns HTTP 200", %{conn: conn} do
 +      user = insert(:user)
 +
 +      response =
 +        conn
 +        |> assign(:user, user)
 +        |> post("/api/pleroma/disable_account", %{"password" => "test"})
 +        |> json_response(:ok)
 +
 +      assert response == %{"status" => "success"}
 +
 +      user = User.get_cached_by_id(user.id)
 +
 +      assert user.info.deactivated == true
 +    end
 +  end
  end