5 commits

Author	SHA1	Message	Date
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
Nick Schonning	0c9d455ea5	Upgrade to Stylelint 15 with Prettier (#23558)	2023-02-13 04:57:03 +01:00
Claire	cba7158085	Fix prettifier/lint issues (#2066) ... * Add glitch-soc locale files to prettierignore * Run prettier on theme.yml * Add glitch-soc emoji_map.json to .prettierignore * Run prettier on config/i18n-tasks.yml	2023-01-04 18:38:45 +01:00
Erik Sundell	64bea71714	helm: cleanup helm chart, now in mastodon/chart (#21801)	2022-12-09 06:36:29 +01:00
Yamagishi Kazutoshi	584d8b977b	Format JSON and YAML using Prettier (#17823) ... * Format JSON and YAML using Prettier * Add prettier to devDep	2022-03-21 04:46:11 +01:00