aboutsummaryrefslogtreecommitdiff
path: root/docs/config.md
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-08-24 16:01:57 +0000
committerkaniini <ariadne@dereferenced.org>2019-08-24 16:01:57 +0000
commit83aeb6090072986d39dc52de05f5a23164f8ce04 (patch)
tree1f510711f7bad7b69df9d3c2d01f3663d4e126fb /docs/config.md
parentbc78a875c86db42d67122cfb767f239a55dacbea (diff)
parent1d7033d96289edf0adf2ca61a725f93b345305ec (diff)
downloadpleroma-83aeb6090072986d39dc52de05f5a23164f8ce04.tar.gz
Merge branch 'activity-expiration' into 'develop'
Activity expiration See merge request pleroma/pleroma!1595
Diffstat (limited to 'docs/config.md')
-rw-r--r--docs/config.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md
index c246e2f6c..414b54660 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -495,6 +495,10 @@ config :auto_linker,
* `total_user_limit`: the number of scheduled activities a user is allowed to create in total (Default: `300`)
* `enabled`: whether scheduled activities are sent to the job queue to be executed
+## Pleroma.ActivityExpiration
+
+# `enabled`: whether expired activities will be sent to the job queue to be deleted
+
## Pleroma.Web.Auth.Authenticator
* `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator