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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc spec/lib/feed_manager_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge