diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-02-24 07:28:35 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-02-24 07:28:35 +0000 |
| commit | 1e1156b64572e764b7faec13d731c2da647f0de7 (patch) | |
| tree | 4370ed1120cf0c1fecd1c7e4ed3a56769845a18b /config/description.exs | |
| parent | 1961a680ec8fb333fa34a7b102820388c9cf5aa6 (diff) | |
| parent | 8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160 (diff) | |
| download | pleroma-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/description.exs')
| -rw-r--r-- | config/description.exs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/description.exs b/config/description.exs index 53d980c83..f0d1077fd 100644 --- a/config/description.exs +++ b/config/description.exs @@ -662,7 +662,7 @@ config :pleroma, :config_description, [ label: "Fed. incoming replies max depth", type: :integer, description: - "Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while" <> + "Max. depth of reply-to and reply activities fetching on incoming federation, to prevent out-of-memory situations while" <> " fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.", suggestions: [ 100 @@ -1791,6 +1791,12 @@ config :pleroma, :config_description, [ description: "Sign object fetches with HTTP signatures" }, %{ + key: :note_replies_output_limit, + type: :integer, + description: + "The number of Note replies' URIs to be included with outgoing federation (`5` to match Mastodon hardcoded value, `0` to disable the output)." + }, + %{ key: :follow_handshake_timeout, type: :integer, description: "Following handshake timeout", |