Merge branch 'develop' into gun

This commit is contained in:
Alexander Strizhakov 2020-02-29 11:34:50 +03:00
commit 814b275af7
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
208 changed files with 1946 additions and 2688 deletions

View file

@ -198,6 +198,8 @@ config :pleroma, :instance,
max_expiration: 365 * 24 * 60 * 60
},
registrations_open: true,
invites_enabled: false,
account_activation_required: false,
federating: true,
federation_incoming_replies_max_depth: 100,
federation_reachability_timeout_days: 7,
@ -305,6 +307,7 @@ config :pleroma, :activitypub,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,
note_replies_output_limit: 5,
sign_object_fetches: true,
authorized_fetch_mode: false
@ -378,6 +381,8 @@ config :phoenix, :format_encoders, json: Jason
config :phoenix, :json_library, Jason
config :phoenix, :filter_parameters, ["password", "confirm"]
config :pleroma, :gopher,
enabled: false,
ip: {0, 0, 0, 0},
@ -460,6 +465,7 @@ config :pleroma, Oban,
transmogrifier: 20,
scheduled_activities: 10,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 5,
new_users_digest: 1
],