projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 2bde5b8268ed61e6cf988daee6faba2ff0973ffd..9fdb2546e45a5d926d5432d2b074cdb50d7b8874 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-224,6
+224,7
@@
config :pleroma, :instance,
"text/markdown",
"text/bbcode"
],
"text/markdown",
"text/bbcode"
],
+ staff_transparency: [],
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
@@
-856,6
+857,8
@@
config :pleroma, ConcurrentLimiter, [
{Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
]
{Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
]
+config :pleroma, :search, provider: Pleroma.Search.Builtin
+
config :pleroma, :telemetry,
slow_queries_logging: [
enabled: false,
config :pleroma, :telemetry,
slow_queries_logging: [
enabled: false,