mastodon/config/webpack
Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
2020-03-08 19:38:53 +01:00
..
rules Fix build with new sass-loader 2019-11-07 14:56:09 +01:00
configuration.js
development.js Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
generateLocalePacks.js
production.js Replace from uglifyjs to terser (#10956) 2019-06-04 14:17:09 +02:00
shared.js Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
tests.js Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01:00
translationRunner.js