Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.

package.json

@@ -70,6 +70,7 @@
     "@babel/runtime": "^7.8.4",
     "@clusterws/cws": "^0.17.3",
     "@gamestdio/websocket": "^0.3.2",
+    "@rails/ujs": "^6.0.2",
     "array-includes": "^3.1.1",
     "arrow-key-navigation": "^1.1.0",
     "atrament": "0.2.4",
@@ -126,7 +127,6 @@
     "promise.prototype.finally": "^3.1.2",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
-    "@rails/ujs": "^6.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.0",
     "react-hotkeys": "^1.1.4",
@@ -189,5 +189,8 @@
     "sass-lint": "^1.13.1",
     "webpack-dev-server": "^3.10.3",
     "yargs": "^15.3.1"
+  },
+  "resolutions": {
+    "kind-of": "^6.0.3"
   }
 }