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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/admin/dashboard_controller.rb
Simple merge

diff --cc app/views/admin/dashboard/index.html.haml
Simple merge

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

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

diff --cc config/routes.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge