diff options
| author | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
| commit | 61a70e595d9ec7a6937d31b36d33063520cf1385 (patch) | |
| tree | 6d7697e892f9324a5d6f00ed933606fea25fd871 /config | |
| parent | 48635bf45f6402c8f82d4cb66fa42e3e5e8f30c2 (diff) | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/webpack/rules/css.js | 4 | ||||
| -rw-r--r-- | config/webpack/test.js | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index fde013ca0..8a12cd56a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -11,6 +11,7 @@ en: apps: Mobile apps apps_platforms: Use Mastodon from iOS, Android and other platforms browse_directory: Browse a profile directory and filter by interests + browse_local_posts: Browse a live stream of public posts from this server browse_public_posts: Browse a live stream of public posts on Mastodon contact: Contact contact_missing: Not set diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js index 2b7b7017c..6ecfb3164 100644 --- a/config/webpack/rules/css.js +++ b/config/webpack/rules/css.js @@ -20,7 +20,9 @@ module.exports = { { loader: 'sass-loader', options: { - includePaths: ['app/javascript'], + sassOptions: { + includePaths: ['app/javascript'], + }, implementation: require('sass'), sourceMap: true, }, diff --git a/config/webpack/test.js b/config/webpack/test.js index 8b56eb92f..f91244587 100644 --- a/config/webpack/test.js +++ b/config/webpack/test.js @@ -5,4 +5,7 @@ const sharedConfig = require('./shared.js'); module.exports = merge(sharedConfig, { mode: 'development', + optimization: { + minimize: false, + }, }); |