Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837
This commit is contained in:
commit
28584bb224
7 changed files with 70 additions and 9 deletions
|
|
@ -516,7 +516,8 @@ config :pleroma, Pleroma.User,
|
|||
"user_exists",
|
||||
"users",
|
||||
"web"
|
||||
]
|
||||
],
|
||||
email_blacklist: []
|
||||
|
||||
config :pleroma, Oban,
|
||||
repo: Pleroma.Repo,
|
||||
|
|
|
|||
|
|
@ -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"]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue