You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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`		1 year ago
..
actions	Fix haml-lint rubocop style negation cops (#26057)	1 year ago
_actions.html.haml	Add confirmation screen when handling reports (#22375)	2 years ago
_media_attachments.html.haml	Fix UI crash in moderation interface when opening the media modal (#24816)	2 years ago
_status.html.haml	Add ability to view previous edits of a status in admin UI (#19462)	2 years ago
index.html.haml	Change how changes to media attachments are stored for edits (#17696)	3 years ago
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago