aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2019-05-06 16:45:22 +0000
committerlambda <lain@soykaf.club>2019-05-06 16:45:22 +0000
commitce6ca0fefe7feb1c31447287aec117d40233652a (patch)
tree6284b81c9cc888bae9159d76dab7aab6f0e57661 /lib/pleroma/web
parentd089ff24600455fefc17e91807c61ddc61ba107a (diff)
downloadpleroma-ce6ca0fefe7feb1c31447287aec117d40233652a.tar.gz
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
Diffstat (limited to 'lib/pleroma/web')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 1122e6c5d..c03f8ab3a 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -352,7 +352,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
def delete_account(%{assigns: %{user: user}} = conn, params) do
case CommonAPI.Utils.confirm_current_password(user, params["password"]) do
{:ok, user} ->
- Task.start(fn -> User.delete(user) end)
+ User.delete(user)
json(conn, %{status: "success"})
{:error, msg} ->