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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/statuses_controller.rb
Simple merge

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

diff --cc app/views/home/index.html.haml
index ce47418d4045da0051424a7edf555cf40b66420b,3d6283fba1e98cb062a522417543e50f4f69b996..568b23effc52bd03344f0b8b75090b54b4f2fdd7
--- 1/app/views/home/index.html.haml
--- 2/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@@ -6,8 -6,9 +6,8 @@@
  
    %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
    = render_initial_state
 -  = javascript_pack_tag 'application', crossorigin: 'anonymous'
  
- .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+ .notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
    %noscript
      = image_pack_tag 'logo.svg', alt: 'Mastodon'
  

diff --cc app/views/public_timelines/show.html.haml
Simple merge

diff --cc app/views/tags/show.html.haml
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge