mastodon/config/webpack
Thibaut Girka 6fdc4e8d47 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
..
rules Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
configuration.js Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02: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 Bump imports-loader from 0.8.0 to 1.1.0 (#14323) 2020-08-25 22:50:47 +09:00
shared.js Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +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