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

Conflicts:
- `app/validators/status_length_validator.rb`:
  Conflict due to glitch-soc's configurable maximum toot chars.
  Ported upstream changes.
This commit is contained in:
Claire
2021-03-11 16:08:15 +01:00
16 changed files with 116 additions and 204 deletions

View File

@ -64,10 +64,10 @@
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-decorators": "^7.13.5",
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.8",
"@babel/preset-env": "^7.13.8",
"@babel/plugin-transform-runtime": "^7.13.9",
"@babel/preset-env": "^7.13.9",
"@babel/preset-react": "^7.12.13",
"@babel/runtime": "^7.13.8",
"@babel/runtime": "^7.13.9",
"@clusterws/cws": "^3.0.0",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
@ -88,7 +88,7 @@
"color-blend": "^3.0.1",
"compression-webpack-plugin": "^6.1.1",
"cross-env": "^7.0.3",
"css-loader": "^5.1.0",
"css-loader": "^5.1.1",
"cssnano": "^4.1.10",
"detect-passive-events": "^2.0.3",
"dotenv": "^8.2.0",
@ -145,7 +145,7 @@
"react-select": "^3.2.0",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.13.9",
"react-textarea-autosize": "^8.3.1",
"react-textarea-autosize": "^8.3.2",
"react-toggle": "^4.1.1",
"redis": "^3.0.2",
"redux": "^4.0.5",