diff options
| author | feld <feld@feld.me> | 2020-11-18 18:57:47 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-11-18 18:57:47 +0000 |
| commit | a1056aace19d5f6201f06937a93f978917df8418 (patch) | |
| tree | eea912566f582d2c30800a0ad8b159e26b3b9193 | |
| parent | aae669d05ec737f7e895ed0d19f7b0eacf6cd005 (diff) | |
| parent | 56d95203b57030c344e08100002784628b9ea021 (diff) | |
| download | pleroma-a1056aace19d5f6201f06937a93f978917df8418.tar.gz pleroma-a1056aace19d5f6201f06937a93f978917df8418.zip | |
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/mix/pleroma.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a9260793..cd90562c2 100644 --- 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 49ba2aae4..3de11efce 100644 --- 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() |