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

diff --cc app/controllers/auth/sessions_controller.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge