diff options
| author | lain <lain@soykaf.club> | 2020-04-21 12:00:33 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-21 12:00:33 +0200 |
| commit | 5165287ff49ff894d2c318fd1138b789a97f9cce (patch) | |
| tree | 97be7133fb193dd1d4647830b60eccb81e93a0fc /config/description.exs | |
| parent | b5df4a98e4044cf1360f03f7dc3a0b59932ec8f5 (diff) | |
| parent | e57c1b60e4a0f882d5217bf1be8b1a7240aa322d (diff) | |
| download | pleroma-5165287ff49ff894d2c318fd1138b789a97f9cce.tar.gz pleroma-5165287ff49ff894d2c318fd1138b789a97f9cce.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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"] } ] }, |