Merge branch 'fix/mix-task-user-delete_activities' into 'develop'

Fix mix pleroma.user delete_activities task

See merge request pleroma/pleroma!3156

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a92607932acc39c5107f91612742effe02b0a88..cd90562c29fed5c35dc4933d2a8626ef32a2878a 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`.
 - S3 Uploads with Elixir 1.11.
+- Mix task pleroma.user delete_activities for source installations.
 
 ## [2.2.0] - 2020-11-12
 

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index 49ba2aae4b0d6daf9f6bc3356015e6cc062ab976..3de11efcec82064857994dac1d90ba810328f898 100644 (file)
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -14,7 +14,7 @@ defmodule Mix.Pleroma do
     :swoosh,
     :timex
   ]
-  @cachex_children ["object", "user", "scrubber"]
+  @cachex_children ["object", "user", "scrubber", "web_resp"]
   @doc "Common functions to be reused in mix tasks"
   def start_pleroma do
     Pleroma.Config.Holder.save_default()