diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-08-05 17:46:24 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-08-05 17:46:24 +0300 |
| commit | 2299bfe4c19697e7c0250e052d3496533595c58b (patch) | |
| tree | 798b789f4cf68be68658765af0547b908640f271 /config/description.exs | |
| parent | 97b57014496003cabb416766457552ef854fa658 (diff) | |
| parent | 474aba984f2184d4f028c56f687d1a12f69d5c47 (diff) | |
| download | pleroma-2299bfe4c19697e7c0250e052d3496533595c58b.tar.gz pleroma-2299bfe4c19697e7c0250e052d3496533595c58b.zip | |
Merge branch 'develop' into refactor/config-get
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index ae2f6d23f..d823812fb 100644 --- a/config/description.exs +++ b/config/description.exs @@ -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"] } ] }, |