diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-10 01:08:33 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-10 01:08:33 +0000 |
| commit | be92edcb29494d12896983a1dcb39ea8359d2c68 (patch) | |
| tree | 307b8912f2e5aea86cdbde28d742532e2363d71e | |
| parent | b57db828c7555e319c5ced4c1804c9f581ef5cdc (diff) | |
| parent | 5419b1a030071a7fbe7385eff87132b4dbd8e0a3 (diff) | |
| download | pleroma-be92edcb29494d12896983a1dcb39ea8359d2c68.tar.gz | |
Merge branch 'fix-alphasort' into 'develop'
Alpha sort the restricted nicknames
See merge request pleroma/pleroma!650
| -rw-r--r-- | config/config.exs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/config/config.exs b/config/config.exs index 4f4e2368a..9f0f4cd4f 100644 --- 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 |