projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 4f4e2368a4970749910c7910a2516b2c6250b760..d30b0aad003232e021f67c513bf8fcb6ac45af19 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-138,7
+138,9
@@
config :pleroma, :instance,
],
finmoji_enabled: true,
mrf_transparency: true,
],
finmoji_enabled: true,
mrf_transparency: true,
- autofollowed_nicknames: []
+ autofollowed_nicknames: [],
+ max_pinned_statuses: 1,
+ no_attachment_links: 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
@@
-237,34
+239,34
@@
config :cors_plug,
config :pleroma, Pleroma.User,
restricted_nicknames: [
config :pleroma, Pleroma.User,
restricted_nicknames: [
- "
about
",
+ "
.well-known
",
"~",
"~",
- "main",
- "users",
- "settings",
- "objects",
+ "about",
"activities",
"activities",
- "web",
- "registration",
- "friend-requests",
- "pleroma",
"api",
"api",
- "tag",
+ "auth",
+ "dev",
+ "friend-requests",
+ "inbox",
+ "internal",
+ "main",
+ "media",
+ "nodeinfo",
"notice",
"notice",
- "status",
- "user-search",
- "ostatus_subscribe",
"oauth",
"oauth",
+ "objects",
+ "ostatus_subscribe",
+ "pleroma",
+ "proxy",
"push",
"push",
+ "registration",
"relay",
"relay",
- "inbox",
- ".well-known",
- "nodeinfo",
- "auth",
- "proxy",
- "dev",
- "internal",
- "media"
+ "settings",
+ "status",
+ "tag",
+ "user-search",
+ "users",
+ "web"
]
config :pleroma, Pleroma.Web.Federator, max_jobs: 50
]
config :pleroma, Pleroma.Web.Federator, max_jobs: 50