aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-07 14:51:26 +0000
committerlain <lain@soykaf.club>2020-08-07 14:51:26 +0000
commit9cebdf30a4ece49fb3b00185887b0801fd1b5452 (patch)
tree10a389a37e0be745432bde95f7a2f56db061daf2
parent568ded5aa48a4d3d31557c8d3c86c294e79058f3 (diff)
parente639eee82e1e0136bf6e64e571f2b05b5b7b948c (diff)
downloadpleroma-9cebdf30a4ece49fb3b00185887b0801fd1b5452.tar.gz
Merge branch 'spoopy-user' into 'develop'
restricted_nicknames: Add names from MastoAPI endpoints See merge request pleroma/pleroma!2857
-rw-r--r--config/config.exs8
1 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 933a899ab..393f74372 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -515,7 +515,13 @@ config :pleroma, Pleroma.User,
"user-search",
"user_exists",
"users",
- "web"
+ "web",
+ "verify_credentials",
+ "update_credentials",
+ "relationships",
+ "search",
+ "confirmation_resend",
+ "mfa"
],
email_blacklist: []