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

Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
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/lib/feed_manager.rb
Simple merge

diff --cc app/serializers/rest/account_serializer.rb
index 657dd36f3b37be2da97243340dc8dda6655a227e,0db1916b0740640cf0ef64eb155da9ab2d5579e6..4e497cdbdd28d3f0a4200bb575d75ab94ae954b3
--- 1/app/serializers/rest/account_serializer.rb
--- 2/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@@ -56,7 -56,7 +56,11 @@@ class REST::AccountSerializer < ActiveM
      object.moved? && object.moved_to_account.moved_to_account_id.nil?
    end
  
+   def last_status_at
+     object.last_status_at&.to_date&.iso8601
+   end
++
 +  def followers_count
 +    (Setting.hide_followers_count || object.user&.setting_hide_followers_count) ? -1 : object.followers_count
 +  end
  end

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

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge