Merge remote-tracking branch 'origin/develop' into live-dashboard
This commit is contained in:
commit
e1b89fe3aa
3842 changed files with 4336 additions and 12293 deletions
|
|
@ -322,9 +322,6 @@ config :pleroma, :frontend_configurations,
|
|||
subjectLineBehavior: "email",
|
||||
theme: "pleroma-dark",
|
||||
webPushNotifications: false
|
||||
},
|
||||
masto_fe: %{
|
||||
showInstanceSpecificPanel: true
|
||||
}
|
||||
|
||||
config :pleroma, :assets,
|
||||
|
|
@ -353,6 +350,7 @@ config :pleroma, :manifest,
|
|||
config :pleroma, :activitypub,
|
||||
unfollow_blocked: true,
|
||||
outgoing_blocks: true,
|
||||
blockers_visible: true,
|
||||
follow_handshake_timeout: 500,
|
||||
note_replies_output_limit: 5,
|
||||
sign_object_fetches: true,
|
||||
|
|
@ -561,6 +559,7 @@ config :pleroma, Oban,
|
|||
mailer: 10,
|
||||
transmogrifier: 20,
|
||||
scheduled_activities: 10,
|
||||
poll_notifications: 10,
|
||||
background: 5,
|
||||
remote_fetcher: 2,
|
||||
attachments_cleanup: 1,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue