4 commits

Author	SHA1	Message	Date
Claire	0092fe50ac	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
Matt Jankowski	e663e6d2c2	Fix haml-lint ConsecutiveSilentScripts rule (#26043)	2023-07-18 09:25:37 +02:00
Claire	d37f426f95	Add back missing glitch-soc admin settings (#1919) ... Fixes #1890	2022-11-12 13:24:53 +01:00
Eugen Rochko	7c152acb2c	Change settings area to be separated into categories in admin UI (#19407) ... And update all descriptions	2022-10-22 11:44:41 +02:00