diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-09 12:46:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-09 12:46:12 +0100 |
| commit | 85558a5e18a58247606954050a5866e62c877f91 (patch) | |
| tree | 982808241c0f64c20f8eec9b1ce5651b3c5195da /app/workers/activitypub | |
| parent | 76b4e7727b7497c1b68e06133831701f8950ae19 (diff) | |
| parent | c5a4d8c82ddd5265abc830959a58cdaf1f061a43 (diff) | |
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.
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/processing_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb index 5e36fab51..1bb94b7f2 100644 --- a/app/workers/activitypub/processing_worker.rb +++ b/app/workers/activitypub/processing_worker.rb @@ -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 |