From: lain <lain@soykaf.club>
Date: Mon, 15 Nov 2021 13:21:42 +0000 (+0000)
Subject: Merge branch 'fix-object-deletion-timeout' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6aff3d320478df678aeda9bc58b9d4e4b3afbf75;p=akkoma

Merge branch 'fix-object-deletion-timeout' into 'develop'

Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted

Closes #2704

See merge request pleroma/pleroma!3479
---

6aff3d320478df678aeda9bc58b9d4e4b3afbf75
diff --cc CHANGELOG.md
index 6a1ae9cb6,8befe7476..bab6c2580
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -69,9 -29,17 +69,10 @@@ The format is based on [Keep a Changelo
  - Checking activated Upload Filters for required commands.
  - Remote users can no longer reappear after being deleted.
  - Deactivated users may now be deleted.
+ - Deleting an activity with a lot of likes/boosts no longer causes a database timeout.
  - 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