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

Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.

diff --cc Gemfile.lock
Simple merge

diff --cc Vagrantfile
Simple merge

diff --cc app/javascript/styles/fonts/montserrat.scss
index 80c2329b008662c606781d370ea44ffed511ea78,ea7e04536aae695543c12ac3f945f76b8a04f573..2abcb0c2b9fd6d7d9565079fb4dd4fb8eafd95b3
--- 1/app/javascript/styles/fonts/montserrat.scss
--- 2/app/javascript/styles/fonts/montserrat.scss
+++ b/app/javascript/styles/fonts/montserrat.scss
@@@ -1,17 -1,19 +1,19 @@@
  @font-face {
    font-family: 'mastodon-font-display';
    src: local('Montserrat'),
 -    url('../fonts/montserrat/Montserrat-Regular.woff2') format('woff2'),
 -    url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'),
 -    url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
 +    url('~fonts/montserrat/Montserrat-Regular.woff2') format('woff2'),
 +    url('~fonts/montserrat/Montserrat-Regular.woff') format('woff'),
 +    url('~fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
    font-weight: 400;
+   font-display: swap;
    font-style: normal;
  }
  
  @font-face {
    font-family: 'mastodon-font-display';
    src: local('Montserrat Medium'),
 -    url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
 +    url('~fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
    font-weight: 500;
+   font-display: swap;
    font-style: normal;
  }

diff --cc app/javascript/styles/fonts/roboto-mono.scss
index c793aa6edc339c18d460befe789413e3a7b4d3b0,bd9839abfb7f252151d5df193cff195c629b5786..a9513dcceb4f915a7b36439773c916d422cb37c8
--- 1/app/javascript/styles/fonts/roboto-mono.scss
--- 2/app/javascript/styles/fonts/roboto-mono.scss
+++ b/app/javascript/styles/fonts/roboto-mono.scss
@@@ -1,10 -1,11 +1,11 @@@
  @font-face {
    font-family: 'mastodon-font-monospace';
    src: local('Roboto Mono'),
 -    url('../fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
 -    url('../fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
 -    url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
 -    url('../fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
 +    url('~fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
 +    url('~fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
 +    url('~fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
 +    url('~fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
    font-weight: 400;
+   font-display: swap;
    font-style: normal;
  }

diff --cc app/javascript/styles/fonts/roboto.scss
index b75fdb927575b36ba91627f4840656a0c64ffba1,f3a6dcb6e774ef2e1fafd07c0a2bf9222d304696..817b448c1d82d799e8f6d2528501f267e5cd9b72
--- 1/app/javascript/styles/fonts/roboto.scss
--- 2/app/javascript/styles/fonts/roboto.scss
+++ b/app/javascript/styles/fonts/roboto.scss
@@@ -1,43 -1,47 +1,47 @@@
  @font-face {
    font-family: 'mastodon-font-sans-serif';
    src: local('Roboto Italic'),
 -    url('../fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
 -    url('../fonts/roboto/roboto-italic-webfont.woff') format('woff'),
 -    url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
 -    url('../fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
 +    url('~fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
 +    url('~fonts/roboto/roboto-italic-webfont.woff') format('woff'),
 +    url('~fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
 +    url('~fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
    font-weight: normal;
+   font-display: swap;
    font-style: italic;
  }
  
  @font-face {
    font-family: 'mastodon-font-sans-serif';
    src: local('Roboto Bold'),
 -    url('../fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
 -    url('../fonts/roboto/roboto-bold-webfont.woff') format('woff'),
 -    url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
 -    url('../fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
 +    url('~fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
 +    url('~fonts/roboto/roboto-bold-webfont.woff') format('woff'),
 +    url('~fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
 +    url('~fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
    font-weight: bold;
+   font-display: swap;
    font-style: normal;
  }
  
  @font-face {
    font-family: 'mastodon-font-sans-serif';
    src: local('Roboto Medium'),
 -    url('../fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
 -    url('../fonts/roboto/roboto-medium-webfont.woff') format('woff'),
 -    url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
 -    url('../fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
 +    url('~fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
 +    url('~fonts/roboto/roboto-medium-webfont.woff') format('woff'),
 +    url('~fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
 +    url('~fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
    font-weight: 500;
+   font-display: swap;
    font-style: normal;
  }
  
  @font-face {
    font-family: 'mastodon-font-sans-serif';
    src: local('Roboto'),
 -    url('../fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
 -    url('../fonts/roboto/roboto-regular-webfont.woff') format('woff'),
 -    url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
 -    url('../fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
 +    url('~fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
 +    url('~fonts/roboto/roboto-regular-webfont.woff') format('woff'),
 +    url('~fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
 +    url('~fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
    font-weight: normal;
+   font-display: swap;
    font-style: normal;
  }

diff --cc config/environments/production.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge