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 https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 23ada389b4fb8c0554bd1f65eec293abd4ff8685..8e3d7822430f67da0ecf64296b04449cbce34a43 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-222,6
+222,9
@@
config :pleroma, :instance,
"text/markdown",
"text/bbcode"
],
"text/markdown",
"text/bbcode"
],
+ mrf_transparency: true,
+ mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
@@
-391,6
+394,11
@@
config :pleroma, :mrf_keyword,
federated_timeline_removal: [],
replace: []
federated_timeline_removal: [],
replace: []
+config :pleroma, :mrf_hashtag,
+ sensitive: ["nsfw"],
+ reject: [],
+ federated_timeline_removal: []
+
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_activity_expiration, days: 365
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_activity_expiration, days: 365