Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

package.json

@@ -204,8 +204,8 @@
     "lint-staged": "^13.2.2",
     "prettier": "^2.8.8",
     "react-test-renderer": "^18.2.0",
-    "stylelint": "^15.6.2",
-    "stylelint-config-standard-scss": "^9.0.0",
+    "stylelint": "^15.10.1",
+    "stylelint-config-standard-scss": "^10.0.0",
     "typescript": "^5.0.4",
     "webpack-dev-server": "^3.11.3",
     "yargs": "^17.7.2"