Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
activity	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01: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