Claire ce84d163cc 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.		2023-02-13 19:35:35 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-10 22:49:59 +01:00
containers	Enable ESLint import recommended rules (#23315)	2023-02-13 15:12:31 +01:00
util	Enable ESLint no-useless-escape (#23311)	2023-02-13 15:12:14 +01:00
index.js	Upgrade ESlint to v8 (#23305)	2023-01-30 01:45:35 +01:00