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 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2 years ago
..
config/initializers	Fix rate limiting for paths with formats (#20675)	2 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
fabricators	png optimization(loss less) (#19630)	2 years ago
features	Change public accounts pages to mount the web UI (#19319)	2 years ago
fixtures	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2 years ago
helpers	Use Rails tag API to build RSS feed for spoilers and polls (#20163)	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	Add support for language preferences for trending statuses and links (#18288)	2 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
requests	Change public accounts pages to mount the web UI (#19319)	2 years ago
routing	Change public accounts pages to mount the web UI (#19319)	2 years ago
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	5 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
support	Validate nodeinfo response by schema (#21395)	2 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views/statuses	Fix style for hashes (#20518)	2 years ago
workers	Fix followers count not being updated when migrating follows (#19998)	2 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