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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/auth/passwords_controller.rb
Simple merge

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/controllers/auth/sessions_controller.rb
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/models/status.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc package.json
index b6e11bc9a44af2455959d781f12e2b94798df95f,998297005c9af4ccb72e6d7dfa26e2ee623e0461..97a7c4960513d5682e7593bc4ceaf0b0de6799a7
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,11 -71,10 +72,11 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.4",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.8",
-     "axios": "^0.23.0",
-     "babel-loader": "^8.2.2",
+     "axios": "^0.24.0",
+     "babel-loader": "^8.2.3",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.0.0",
      "babel-plugin-react-intl": "^6.2.0",

diff --cc yarn.lock
Simple merge