projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 0db940fdc84afe5d18d59121d14c7eba01672beb..9e4ee8d02e1ecc576f649843195db6223362c0f8 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-115,7
+115,7
@@
config :logger, :console,
config :logger, :ex_syslogger,
level: :debug,
ident: "Pleroma",
config :logger, :ex_syslogger,
level: :debug,
ident: "Pleroma",
- format: "$
date $time $
metadata[$level] $message",
+ format: "$metadata[$level] $message",
metadata: [:request_id]
config :mime, :types, %{
metadata: [:request_id]
config :mime, :types, %{
@@
-238,6
+238,11
@@
config :pleroma, :mrf_simple,
reject: [],
accept: []
reject: [],
accept: []
+config :pleroma, :mrf_keyword,
+ reject: [],
+ federated_timeline_removal: [],
+ replace: []
+
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,