diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-22 09:31:43 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-22 09:31:43 +0300 |
| commit | 8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160 (patch) | |
| tree | f14a1ef01c90124b33b2866117ed2995e32ab369 /docs/configuration | |
| parent | 0d14c3f41053f97d23fa9295745a817c08010969 (diff) | |
| parent | 114e7b764ed5ae03211cca40e7b19f33292b3d1c (diff) | |
| download | pleroma-8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160.tar.gz pleroma-8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# CHANGELOG.md
# config/config.exs
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index c9559fe85..ac55a0b32 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -143,10 +143,11 @@ config :pleroma, :mrf_user_allowlist, * `:reject` rejects the message entirely ### :activitypub -* ``unfollow_blocked``: Whether blocks result in people getting unfollowed -* ``outgoing_blocks``: Whether to federate blocks to other instances -* ``deny_follow_blocked``: Whether to disallow following an account that has blocked the user in question -* ``sign_object_fetches``: Sign object fetches with HTTP signatures +* `unfollow_blocked`: Whether blocks result in people getting unfollowed +* `outgoing_blocks`: Whether to federate blocks to other instances +* `deny_follow_blocked`: Whether to disallow following an account that has blocked the user in question +* `sign_object_fetches`: Sign object fetches with HTTP signatures +* `authorized_fetch_mode`: Require HTTP signatures for AP fetches ### :fetch_initial_posts * `enabled`: if enabled, when a new user is federated with, fetch some of their latest posts |