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

Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index acde440de79536cfe43a8cf160d47a71cf598f9e,266ce3759e81862ca3a9d89959bc417b75e1f397..0e1042c7ca1f032e1cfa538dc363b67e461b22ad
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -485,8 -483,7 +483,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
-     redis (4.3.1)
 +    redcarpet (3.5.1)
+     redis (4.4.0)
      redis-namespace (1.8.1)
        redis (>= 3.0.4)
      regexp_parser (2.1.1)
@@@ -762,8 -758,7 +759,8 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
-   redis (~> 4.3)
 +  redcarpet (~> 3.5)
+   redis (~> 4.4)
    redis-namespace (~> 1.8)
    rqrcode (~> 2.0)
    rspec-rails (~> 5.0)

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

diff --cc app/lib/activitypub/activity/create.rb
Simple merge

diff --cc config/navigation.rb
index 805a21c04baece35f306a3a8822d6ab84f1f9d48,37bfd7549bded1ae030be888dbaa4ba8f0526be4..d4818dbb5a288249bb2f6d4f65dfdbb1575fddf0
--- 1/config/navigation.rb
--- 2/config/navigation.rb
+++ b/config/navigation.rb
@@@ -16,14 -16,9 +16,15 @@@ SimpleNavigation::Configuration.run do 
        s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_url
      end
  
 +    n.item :flavours, safe_join([fa_icon('paint-brush fw'), t('settings.flavours')]), settings_flavours_url do |flavours|
 +      Themes.instance.flavours.each do |flavour|
 +        flavours.item flavour.to_sym, safe_join([fa_icon('star fw'), t("flavours.#{flavour}.name", default: flavour)]), settings_flavour_url(flavour)
 +      end
 +    end
 +
      n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url, if: -> { current_user.functional? }
      n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? }
+     n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_url, if: -> { current_user.functional? }
  
      n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_url do |s|
        s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities}

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge