Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
This commit is contained in:
@@ -15,6 +15,6 @@ class ActivityPub::ProcessingWorker
|
||||
|
||||
ActivityPub::ProcessCollectionService.new.call(body, actor, override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
|
||||
rescue ActiveRecord::RecordInvalid => e
|
||||
Rails.logger.debug "Error processing incoming ActivityPub object: #{e}"
|
||||
Rails.logger.debug { "Error processing incoming ActivityPub object: #{e}" }
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user