summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-02-24 07:28:35 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-02-24 07:28:35 +0000
commit1e1156b64572e764b7faec13d731c2da647f0de7 (patch)
tree4370ed1120cf0c1fecd1c7e4ed3a56769845a18b /config/config.exs
parent1961a680ec8fb333fa34a7b102820388c9cf5aa6 (diff)
parent8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160 (diff)
downloadpleroma-1e1156b64572e764b7faec13d731c2da647f0de7.tar.gz
pleroma-1e1156b64572e764b7faec13d731c2da647f0de7.zip
Merge branch '1505-threads-federation' into 'develop'
[#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 42e2d06a8..9d1e29c0d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -328,6 +328,7 @@ config :pleroma, :activitypub,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,
+ note_replies_output_limit: 5,
sign_object_fetches: true,
authorized_fetch_mode: false
@@ -483,6 +484,7 @@ config :pleroma, Oban,
transmogrifier: 20,
scheduled_activities: 10,
background: 5,
+ remote_fetcher: 2,
attachments_cleanup: 5,
new_users_digest: 1
],