Merge branch 'develop' into global-status-expiration

This commit is contained in:
Egor Kislitsyn 2020-03-16 15:31:31 +04:00
commit 421e35b578
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
108 changed files with 1235 additions and 886 deletions

View file

@ -156,14 +156,6 @@ config :pleroma, :mrf_user_allowlist,
* `sign_object_fetches`: Sign object fetches with HTTP signatures
* `authorized_fetch_mode`: Require HTTP signatures for AP fetches
### :fetch_initial_posts
!!! warning
Be careful with this setting, fetching posts may lead to new users being discovered whose posts will then also be fetched. This can lead to serious load on your instance and database.
* `enabled`: If enabled, when a new user is discovered by your instance, fetch some of their latest posts.
* `pages`: The amount of pages to fetch
## Pleroma.ScheduledActivity
* `daily_user_limit`: the number of scheduled activities a user is allowed to create in a single day (Default: `25`)