From: feld <feld@feld.me>
Date: Fri, 20 Nov 2020 18:40:15 +0000 (+0000)
Subject: Merge branch 'fix/2302-report-duplicates' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e;p=akkoma

Merge branch 'fix/2302-report-duplicates' into 'develop'

Fix for forwarded reports

Closes #2303 and #2302

See merge request pleroma/pleroma!3146
---

ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e
diff --cc CHANGELOG.md
index fe9b2b4d1,5e09df22c..281f06729
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -50,12 -48,16 +50,18 @@@ The format is based on [Keep a Changelo
  ### Fixed
  
  - Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`.
 +- Search: RUM index search speed has been fixed.
  - S3 Uploads with Elixir 1.11.
 +- Emoji Reaction activity filtering from blocked and muted accounts.
  - Mix task pleroma.user delete_activities for source installations.
+ - Fix ability to update Pleroma Chat push notifications with PUT /api/v1/push/subscription and alert type pleroma:chat_mention
+ - Forwarded reports duplication from Pleroma instances.
+ 
+ <details>
+   <summary>API</summary>
+ - Statuses were not displayed for Mastodon forwarded reports.
+ 
+ </details>
  
  ## [2.2.0] - 2020-11-12