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`		2023-01-05 14:16:25 +01:00
..
config/initializers	Fix rate limiting for paths with formats (#20675)	2022-11-14 20:26:31 +01:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
fabricators
features
fixtures	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
helpers	Use Rails tag API to build RSS feed for spoilers and polls (#20163)	2022-12-15 16:39:41 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
mailers
models	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
policies
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
requests
routing
serializers/activitypub
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
support	Validate nodeinfo response by schema (#21395)	2022-12-15 15:43:05 +01:00
validators
views/statuses	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
workers
rails_helper.rb
spec_helper.rb