Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes. - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.		2024-10-19 19:13:32 +02:00
..
activity	Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream	2024-10-19 19:13:32 +02:00
parser	Normalize language code of incoming posts (#30403)	2024-05-23 17:28:18 +00:00
adapter_spec.rb	Fix duplicate `orderedItems` in user archive's `outbox.json` (#31099)	2024-07-22 08:56:05 +00:00
dereferencer_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
linked_data_signature_spec.rb	Fix security context sometimes not being added in LD-Signed activities (#31871)	2024-09-12 12:58:12 +00:00
tag_manager_spec.rb	Add `context` and `before` to lengthy tag manager spec examples (#29129)	2024-02-08 10:03:04 +00:00