projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 36bea19a089a51d035c696d2446ba8cf24e426df..f4d92102f70743f6f8d367eb977d11d0a073c7f8 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-279,7
+279,8
@@
config :pleroma, :instance,
max_remote_account_fields: 20,
account_field_name_length: 512,
account_field_value_length: 2048,
max_remote_account_fields: 20,
account_field_name_length: 512,
account_field_value_length: 2048,
- external_user_synchronization: true
+ external_user_synchronization: true,
+ extended_nickname_format: false
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@
-408,7
+409,8
@@
config :pleroma, Pleroma.Web.Metadata,
providers: [
Pleroma.Web.Metadata.Providers.OpenGraph,
Pleroma.Web.Metadata.Providers.TwitterCard,
providers: [
Pleroma.Web.Metadata.Providers.OpenGraph,
Pleroma.Web.Metadata.Providers.TwitterCard,
- Pleroma.Web.Metadata.Providers.RelMe
+ Pleroma.Web.Metadata.Providers.RelMe,
+ Pleroma.Web.Metadata.Providers.Feed
],
unfurl_nsfw: false
],
unfurl_nsfw: false
@@
-587,7
+589,7
@@
config :pleroma, :env, Mix.env()
config :http_signatures,
adapter: Pleroma.Signature
config :http_signatures,
adapter: Pleroma.Signature
-config :pleroma, :rate_limit,
nil
+config :pleroma, :rate_limit,
authentication: {60_000, 15}
config :pleroma, Pleroma.ActivityExpiration, enabled: true
config :pleroma, Pleroma.ActivityExpiration, enabled: true