commit: be92edcb29494d12896983a1dcb39ea8359d2c68
parent: b57db828c7555e319c5ced4c1804c9f581ef5cdc
Author: kaniini <nenolod@gmail.com>
Date: Thu, 10 Jan 2019 01:08:33 +0000
Merge branch 'fix-alphasort' into 'develop'
Alpha sort the restricted nicknames
See merge request pleroma/pleroma!650
Diffstat:
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -237,34 +237,34 @@ config :cors_plug,
config :pleroma, Pleroma.User,
restricted_nicknames: [
- "about",
+ ".well-known",
"~",
- "main",
- "users",
- "settings",
- "objects",
+ "about",
"activities",
- "web",
- "registration",
- "friend-requests",
- "pleroma",
"api",
- "tag",
+ "auth",
+ "dev",
+ "friend-requests",
+ "inbox",
+ "internal",
+ "main",
+ "media",
+ "nodeinfo",
"notice",
- "status",
- "user-search",
- "ostatus_subscribe",
"oauth",
+ "objects",
+ "ostatus_subscribe",
+ "pleroma",
+ "proxy",
"push",
+ "registration",
"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