projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 41c1ff6371a21e56af6a4fdaf45aaf79801096c1..cb1551c2ad8347b4c7bb79fa413ff8ba895c1bba 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-241,7
+241,7
@@
config :pleroma, :instance,
mrf_transparency_exclusions: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
mrf_transparency_exclusions: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
-
no_attachment_links: tru
e,
+
attachment_links: fals
e,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
@@
-326,6
+326,7
@@
config :pleroma, :activitypub,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,
+ note_replies_output_limit: 5,
sign_object_fetches: true
config :pleroma, :streamer,
sign_object_fetches: true
config :pleroma, :streamer,
@@
-480,6
+481,7
@@
config :pleroma, Oban,
transmogrifier: 20,
scheduled_activities: 10,
background: 5,
transmogrifier: 20,
scheduled_activities: 10,
background: 5,
+ remote_fetcher: 2,
attachments_cleanup: 5
],
crontab: [
attachments_cleanup: 5
],
crontab: [