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 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.		2 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
fabricators	Fix report category not being saved in REST API (#17682)	3 years ago
features	Add submit button to the top of preferences pages (#13068)	5 years ago
fixtures	Allow import/export of instance-level domain blocks/allows (#1754)	3 years ago
helpers	Various code cleanup (#1782)	3 years ago
lib	Add test	3 years ago
mailers	Fix failure when sending warning emails with custom text (#17983)	3 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
requests	Further preparation for Rails 6 (#15916)	4 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	5 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
support	Spelling (#17705)	3 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
views	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
workers	Fix single Redis connection being used across all threads (#18135)	3 years ago
rails_helper.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
spec_helper.rb	Improve tests involving push_bulk (#17508)	3 years ago