Commit be92edcb authored by kaniini's avatar kaniini
Browse files

Merge branch 'fix-alphasort' into 'develop'

Alpha sort the restricted nicknames

See merge request !650
parents b57db828 5419b1a0
Pipeline #6127 passed with stages
in 3 minutes and 29 seconds
......@@ -237,34 +237,34 @@
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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment