mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-21 06:08:12 +00:00
Merge remote-tracking branch 'upstream/stable-4.4' into HEAD
Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's theming system. Updated the line as upstream did.
This commit is contained in:
@@ -61,6 +61,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
|
||||
|
||||
ActivityPub::Forwarder.new(@account, @json, @quote.status).forward!
|
||||
@quote.reject!
|
||||
DistributionWorker.perform_async(@quote.status_id, { 'update' => true })
|
||||
end
|
||||
|
||||
def forwarder
|
||||
|
||||
Reference in New Issue
Block a user