hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/update-welcome-setting-in-description

Browse source
This commit is contained in:
Maksim Pechnikov 2020-08-07 09:48:34 +03:00
commit 8e90cc58e7
38 changed files with 435 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/description.exs
View file

@ -3056,6 +3056,7 @@ config :pleroma, :config_description, [
%{
key: :restricted_nicknames,
type: {:list, :string},
description: "List of nicknames users may not register with.",
suggestions: [
".well-known",
"~",
@ -3088,6 +3089,12 @@ config :pleroma, :config_description, [
"users",
"web"
]
},
%{
key: :email_blacklist,
type: {:list, :string},
description: "List of email domains users may not register with.",
suggestions: ["mailinator.com", "maildrop.cc"]
}
]
},