diff options
| author | tusooa <tusooa@kazv.moe> | 2022-11-12 17:55:50 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-11-12 17:55:50 +0000 |
| commit | 1b0e47b79b38468f2b9a52d24dfc42830cc46c0f (patch) | |
| tree | 07cb5a39eb46ce474da955fe91afb9536f99640d /config | |
| parent | 7c8618dc9ad589d1e7b335dde85f7e722ce5ff6f (diff) | |
| parent | e3e68b93774ffb3b45e395e7ea5cea2467b4395f (diff) | |
Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Give admin the choice to not strip reported statuses
Closes #2887
See merge request pleroma/pleroma!3773
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 8dcb80b98..821166fd9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -223,6 +223,7 @@ config :pleroma, :instance, max_pinned_statuses: 1, attachment_links: false, max_report_comment_size: 1000, + report_strip_status: true, safe_dm_mentions: false, healthcheck: false, remote_post_retention_days: 90, diff --git a/config/description.exs b/config/description.exs index a79cfd967..daf60c236 100644 --- a/config/description.exs +++ b/config/description.exs @@ -816,6 +816,12 @@ config :pleroma, :config_description, [ ] }, %{ + key: :report_strip_status, + label: "Report strip status", + type: :boolean, + description: "Strip associated statuses in reports to ids when closed/resolved, otherwise keep a copy" + }, + %{ key: :safe_dm_mentions, label: "Safe DM mentions", type: :boolean, |