logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: a1056aace19d5f6201f06937a93f978917df8418
parent aae669d05ec737f7e895ed0d19f7b0eacf6cd005
Author: feld <feld@feld.me>
Date:   Wed, 18 Nov 2020 18:57:47 +0000

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

Fix mix pleroma.user delete_activities task

See merge request pleroma/pleroma!3156

Diffstat:

MCHANGELOG.md1+
Mlib/mix/pleroma.ex2+-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 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 @@ -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()