summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-04 10:42:52 -0500
committerMark Felder <feld@feld.me>2021-06-01 11:49:46 -0500
commitd6432a65da7ad11f1383d465370c11de5a2d7ddc (patch)
tree10c977a0ca4d5e1f35d92df8ace756dadc1d07b5 /config
parent4a181982c34c774c9ed4b76ce1d95f6c33fce9d5 (diff)
Move shout configuration from :instance, update docs and changelog
Diffstat (limited to 'config')
-rw-r--r--config/config.exs5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index e2bf0cfc1..2f8a18788 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -190,7 +190,6 @@ config :pleroma, :instance,
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
description_limit: 5_000,
- shout_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
@@ -457,7 +456,9 @@ config :pleroma, :media_preview_proxy,
image_quality: 85,
min_content_length: 100 * 1024
-config :pleroma, :shout, enabled: true
+config :pleroma, :shout,
+ enabled: true,
+ limit: 5_000
config :phoenix, :format_encoders, json: Jason