Merge remote-tracking branch 'parent/main' into upstream-20240216

spec/services/activitypub/process_status_update_service_spec.rb

@@ -224,7 +224,8 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
       end
 
       it 'does not update the text, spoiler_text or edited_at' do
-        expect { subject.call(status, json, json) }.to_not(change { s = status.reload; [s.text, s.spoiler_text, s.edited_at] })
+        expect { subject.call(status, json, json) }
+          .to_not(change { status.reload.attributes.slice('text', 'spoiler_text', 'edited_at').values })
       end
     end