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 ad9329502a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		3 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	3 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	Fix some link previews being incorrectly generated from other prior links (#16885)	3 years ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	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	3 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	3 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