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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 8fdc79f39390a1e4deec1689165aa66f4765d510,0f020c4e367568b7b809b1d476dfeea409dd62b8..c829eabaaa97313c14cabb469c931872bf36d70a
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -759,10 -759,9 +760,10 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
 +  redcarpet (~> 3.5)
    redis (~> 4.4)
    redis-namespace (~> 1.8)
-   rqrcode (~> 2.0)
+   rqrcode (~> 2.1)
    rspec-rails (~> 5.0)
    rspec-sidekiq (~> 3.1)
    rspec_junit_formatter (~> 0.4)

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

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge