diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-08 19:38:53 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-08 19:38:53 +0100 |
| commit | c790ecb14d8b06c6242886ff4d2cdf06e70c5cac (patch) | |
| tree | dff0bfefe5a1922c7227ea1ec0236b92e11db699 /config/webpack | |
| parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
| parent | 764b89939fe2fcb8c4389738af8685949104c144 (diff) | |
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.
Diffstat (limited to 'config/webpack')
| -rw-r--r-- | config/webpack/development.js | 2 | ||||
| -rw-r--r-- | config/webpack/shared.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/webpack/development.js b/config/webpack/development.js index 56f6e43f0..774ecbc07 100644 --- a/config/webpack/development.js +++ b/config/webpack/development.js @@ -54,7 +54,7 @@ module.exports = merge(sharedConfig, { watchOptions: Object.assign( {}, settings.dev_server.watch_options, - watchOptions + watchOptions, ), writeToDisk: filePath => /ocr/.test(filePath), }, diff --git a/config/webpack/shared.js b/config/webpack/shared.js index 1741ffdb9..08526957b 100644 --- a/config/webpack/shared.js +++ b/config/webpack/shared.js @@ -98,7 +98,7 @@ module.exports = { // temporary fix for https://github.com/ReactTraining/react-router/issues/5576 // to reduce bundle size resource.request = resource.request.replace(/^history/, 'history/es'); - } + }, ), new MiniCssExtractPlugin({ filename: 'css/[name]-[contenthash:8].css', |