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

Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc Vagrantfile
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

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

diff --cc app/views/layouts/modal.html.haml
Simple merge

diff --cc package.json
index 4cebdda0228e5af9305b7e451682b55119a73004,7ff777b7b99fcc9ef1ab234231dbe80a194584dc..a3f85500e6e3cc1a75176d3a1e882672fa27d80a
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -71,9 -70,8 +71,9 @@@
      "@clusterws/cws": "^3.0.0",
      "@gamestdio/websocket": "^0.3.2",
      "@github/webauthn-json": "^0.5.7",
-     "@rails/ujs": "^6.1.1",
+     "@rails/ujs": "^6.1.2",
      "array-includes": "^3.1.2",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
      "axios": "^0.21.1",

diff --cc yarn.lock
Simple merge