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
..
admin	…
filters	…
notifications	Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` (#31840)	2024-09-16 12:10:02 +00:00
filters_controller.rb	Eager loading fixes for `api/` controllers (#28848)	2024-01-23 11:41:54 +00:00
instances_controller.rb	…
media_controller.rb	…
notifications_controller.rb	Fix last paginated notification group only including data on a single notification (#33271)	2025-01-09 13:47:12 +00:00
search_controller.rb	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	2023-12-21 19:42:13 +01:00
suggestions_controller.rb	…