mastodon-glitch/config/webpack
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
2020-06-09 10:39:20 +02:00
..
rules Fix build with new sass-loader 2019-11-07 14:56:09 +01:00
configuration.js Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
development.js Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
generateLocalePacks.js Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
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-06-09 10:39:20 +02:00
tests.js Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01:00
translationRunner.js Upgrade yargs to v12.0 (#9862) 2019-03-15 03:53:38 +01:00