From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Mon, 9 Aug 2021 09:37:59 +0000 (+0000)
Subject: Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6384d7803520f633a66d1cb9f76e3540863f92fb;hp=-c;p=akkoma

Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'

Simple policy reasons for instance specific policies

See merge request pleroma/pleroma!3314
---

6384d7803520f633a66d1cb9f76e3540863f92fb
diff --combined CHANGELOG.md
index 4e3e40864,7a580d7cd..9e594f174
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -8,17 -8,8 +8,18 @@@ The format is based on [Keep a Changelo
  
  ### Changed
  
 +### Added
 +
 +### Fixed
 +
 +### Removed
 +
 +## 2.4.0 - 2021-08-xx
 +
 +### Changed
 +
  - **Breaking:** Configuration: `:chat, enabled` moved to `:shout, enabled` and `:instance, chat_limit` moved to `:shout, limit`
+ - **Breaking** Entries for simple_policy, transparency_exclusions and quarantined_instances now list both the instance and a reason.
  - Support for Erlang/OTP 24
  - The `application` metadata returned with statuses is no longer hardcoded. Apps that want to display these details will now have valid data for new posts after this change.
  - HTTPSecurityPlug now sends a response header to opt out of Google's FLoC (Federated Learning of Cohorts) targeted advertising.
@@@ -44,6 -35,14 +45,6 @@@
  - Mix task `pleroma.database prune_objects`
  - Fixed rendering of JSON errors on ActivityPub endpoints.
  - Linkify: Parsing crash with URLs ending in unbalanced closed paren, no path separator, and no query parameters
 -
 -### Removed
 -- **Breaking**: Remove deprecated `/api/qvitter/statuses/notifications/read` (replaced by `/api/v1/pleroma/notifications/read`)
 -
 -## Unreleased (Patch)
 -
 -### Fixed
 -
  - Try to save exported ConfigDB settings (migrate_from_db) in the system temp directory if default location is not writable.
  - Uploading custom instance thumbnail via AdminAPI/AdminFE generated invalid URL to the image
  - Applying ConcurrentLimiter settings via AdminAPI
@@@ -52,10 -51,7 +53,10 @@@
  - MRF (`SimplePolicy`): Embedded objects are now checked. If any embedded object would be rejected, its parent is rejected. This fixes Announces leaking posts from blocked domains.
  - Fixed some Markdown issues, including trailing slash in links.
  
 -## [2.3.0] - 2020-03-01
 +### Removed
 +- **Breaking**: Remove deprecated `/api/qvitter/statuses/notifications/read` (replaced by `/api/v1/pleroma/notifications/read`)
 +
 +## [2.3.0] - 2021-03-01
  
  ### Security
  
@@@ -156,7 -152,7 +157,7 @@@
    - Mastodon API: Support for expires_in/expires_at in the Filters.
  </details>
  
 -## [2.2.2] - 2020-01-18
 +## [2.2.2] - 2021-01-18
  
  ### Fixed