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
..
actions	Add support for libvips in addition to ImageMagick (#30090)	2024-06-05 19:15:39 +00:00
ISSUE_TEMPLATE	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
workflows	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
codecov.yml	Second attempt at disabling Codecov annotations (#31841)	2024-09-10 14:00:23 +00:00
renovate.json5	Use ruby version 3.4.1 (#33304)	2025-01-07 13:46:56 +00:00
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	2019-10-26 12:45:52 +02:00