Claire d315c684e4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream entirely refactored this, while we changed the docker repository to upload to and disabled the “latest” tag. Applied the repository change to `.github/workflows/build-*.yml`, as well as disabling native ARMv64 builds. - `README.md`: We have a completely different README. Kept ours. - `app/views/admin/settings/shared/_links.html.haml`: Upstream refactored, we had an extra item. Refactored as upstream did. - `spec/controllers/api/v1/timelines/public_controller_spec.rb`: Upstream deleted this file, to be replaced by a request spec at `spec/requests/api/v1/timelines/public_spec.rb`. We had an extra bit about enabling the public timelines because we have different defaults than upstream. Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`		2023-07-19 07:35:51 +02:00
..
ISSUE_TEMPLATE	Correct prettier calls for YML/JSON (#21832)	2022-12-03 12:05:35 +09:00
workflows	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-19 07:35:51 +02:00
FUNDING.yml	Remove references to discourse.joinmastodon.org (#17797)	2022-03-15 08:13:22 +01:00
renovate.json5	Try to improve Renovatebot config (#26005)	2023-07-17 09:33:22 +02:00
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	2019-10-26 12:45:52 +02:00
stylelint-matcher.json	Set-up Problem Matchers (#18598)	2022-06-16 22:09:43 +02:00