about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/webpack/rules/css.js4
-rw-r--r--config/webpack/test.js3
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,
+  },
 });