catstodon/config/webpack
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
..
rules Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
configuration.js Refactor compile-time glitch-soc theme handling 2022-02-11 23:49:00 +01:00
development.js Bump webpack-merge from 4.2.2 to 5.0.9 (#14424) 2020-11-05 02:21:28 +09:00
generateLocalePacks.js Change locales file generation to use JSON sources (#2028) 2022-12-21 22:13:14 +01:00
production.js Add brotli compression (#19025) 2022-12-15 17:07:36 +01:00
shared.js Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
tests.js Bump jest from 26.6.3 to 27.1.0 (#16376) 2021-08-28 09:58:04 +09:00
translationRunner.js Change locales file generation to use JSON sources (#2028) 2022-12-21 22:13:14 +01:00