Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream

Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.

config/webpack/shared.js

@@ -54,7 +54,11 @@ const entries = Object.assign(
 
 
 module.exports = {
-  entry: entries,
+  entry: {
+    ...entries,
+    // this is cursed, but bypass glitch-soc's theming system for this one
+    inert: './app/javascript/packs/inert.js',
+  },
 
   output: {
     filename: 'js/[name]-[chunkhash].js',