diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-22 20:18:12 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-22 20:18:12 +0400 |
| commit | 6c26feed01b2e836e7ebdefe9683ddb03cb57757 (patch) | |
| tree | 4b143a6708d405e5fc6ebf69910c9ae18066502b /config/description.exs | |
| parent | 11433cd38d9761ddf3fdb94f8c39526910b975c1 (diff) | |
| parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
| download | pleroma-6c26feed01b2e836e7ebdefe9683ddb03cb57757.tar.gz pleroma-6c26feed01b2e836e7ebdefe9683ddb03cb57757.zip | |
Merge branch 'develop' into openapi/account
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs index b1938912c..7fac1e561 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1317,13 +1317,13 @@ config :pleroma, :config_description, [ %{ key: :reject, type: {:list, :string}, - description: "List of instances to reject any activities from", + description: "List of instances to reject activities from (except deletes)", suggestions: ["example.com", "*.example.com"] }, %{ key: :accept, type: {:list, :string}, - description: "List of instances to accept any activities from", + description: "List of instances to only accept activities from (except deletes)", suggestions: ["example.com", "*.example.com"] }, %{ @@ -1343,6 +1343,12 @@ config :pleroma, :config_description, [ type: {:list, :string}, description: "List of instances to strip banners from", suggestions: ["example.com", "*.example.com"] + }, + %{ + key: :reject_deletes, + type: {:list, :string}, + description: "List of instances to reject deletions from", + suggestions: ["example.com", "*.example.com"] } ] }, |