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
..
chewy	Change account search to match by text when opted-in (#25599)	1 year ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
mailers	Refactor `NotificationMailer` to use parameterization (#25718)	1 year ago
models	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
policies	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	1 year ago
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2 years ago
serializers	Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream	1 year ago
services	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
validators	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	1 year ago
views	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago