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 92d1e05c3e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.		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	Add `roles` attribute to Account entities in REST API (#23255)	2 years ago
features	Change public accounts pages to mount the web UI (#19319)	2 years ago
fixtures	Change domain block CSV parsing to be more robust and handle more lists (#21470)	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	Add tests for `REST::AccountSerializer` (#23319)	2 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 `UserCleanupScheduler` crash when an unconfirmed account has a moderation note (#23318)	2 years ago
rails_helper.rb	Apply Rubocop Style/ExpandPathArguments (#23450)	2 years ago
spec_helper.rb	Improve tests involving push_bulk (#17508)	3 years ago