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 '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream	2024-12-25 18:01:37 +01:00
parser	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream	2024-11-03 20:51:58 +01:00
activity.rb	Drop support for ruby 3.1 (#32363)	2024-10-31 15:12:08 +00:00
adapter.rb	Fix duplicate `orderedItems` in user archive's `outbox.json` (#31099)	2024-07-22 08:56:05 +00:00
case_transform.rb	Fix incorrect serialization of regional languages in `contentMap` (#27207)	2023-10-06 17:46:04 +02:00
dereferencer.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00
forwarder.rb	Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034)	2023-03-15 03:45:15 +01:00
linked_data_signature.rb	Fix security context sometimes not being added in LD-Signed activities (#31871)	2024-09-12 12:58:12 +00:00
serializer.rb	Fix `Style/SuperArguments` cop (#30406)	2024-05-24 08:36:21 +00:00
tag_manager.rb	Fix Style/MultipleComparison (#33313)	2025-01-07 11:24:52 +00:00