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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

diff --cc package.json
index 312b06bd8148a07e392a38fde180023634093dcb,0b0a4764d8386313a5e18badb6ff01c599d363f5..56a94873b79cedf6d482bb0aae38f747f67e7604
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,10 -71,9 +72,10 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.3",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
-     "axios": "^0.21.1",
+     "axios": "^0.21.4",
      "babel-loader": "^8.2.2",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.0.0",

diff --cc yarn.lock
Simple merge