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

Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.

diff --cc Gemfile.lock
Simple merge

diff --cc app/helpers/application_helper.rb
index cc622478d8bf77d5bcc90bd4072956cfdb92b170,34fc46615f613f319432062d9a72d733043f3b72..3fbc418cb75ab3c6d9428672679bff5643c8e942
--- 1/app/helpers/application_helper.rb
--- 2/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@@ -137,10 -137,13 +137,14 @@@ module ApplicationHelpe
      end
    end
  
+   def react_admin_component(name, props = {})
+     content_tag(:div, nil, data: { 'admin-component': name.to_s.camelcase, props: Oj.dump({ locale: I18n.locale }.merge(props)) })
+   end
+ 
    def body_classes
      output = (@body_classes || '').split(' ')
 -    output << "theme-#{current_theme.parameterize}"
 +    output << "flavour-#{current_flavour.parameterize}"
 +    output << "skin-#{current_skin.parameterize}"
      output << 'system-font' if current_account&.user&.setting_system_font_ui
      output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')
      output << 'rtl' if locale_direction == 'rtl'

diff --cc app/javascript/core/admin.js
Simple merge

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

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

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

diff --cc app/presenters/instance_presenter.rb
Simple merge

diff --cc app/services/post_status_service.rb
Simple merge

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

diff --cc config/routes.rb
Simple merge