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

Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description

Browse source
This commit is contained in:
Angelina Filippova 2020-08-07 21:05:44 +03:00
commit f21b6ebd5d
39 changed files with 505 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/description.exs
View file

@ -982,8 +982,7 @@ config :pleroma, :config_description, [
%{
key: :message,
type: :string,
description:
"A message that will be sent to newly registered users",
description: "A message that will be sent to newly registered users",
suggestions: [
"Hi, @username! Welcome on board!"
]
@ -3057,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",
"~",
@ -3089,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"]
}
]
},