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

Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.

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

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

diff --cc app/views/admin/trends/links/index.html.haml
index e05f877b098d5a8750fd5bc76529130deb49e443,49a53d979be7c84650962c133d05161ebfca4776..6f090df7b0474f5cdbdc1c61bd8bde0cd3e3ce17
--- 1/app/views/admin/trends/links/index.html.haml
--- 2/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@@ -1,6 -1,13 +1,10 @@@
  - content_for :page_title do
    = t('admin.trends.links.title')
  
 -- content_for :header_tags do
 -  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 -
+ %p= t('admin.trends.links.description_html')
+ 
+ %hr.spacer/
+ 
  = form_tag admin_trends_links_path, method: 'GET', class: 'simple_form' do
    - Trends::PreviewCardFilter::KEYS.each do |key|
      = hidden_field_tag key, params[key] if params[key].present?

diff --cc app/views/admin/trends/links/preview_card_providers/index.html.haml
index 13c279b5330dc17b88fde021d0a759a1bbdff638,c3648c35e97bd39e668d129eef87467bf12943c8..222ff6bda04840489864a9834769162ce76e0909
--- 1/app/views/admin/trends/links/preview_card_providers/index.html.haml
--- 2/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@@ -1,6 -1,13 +1,10 @@@
  - content_for :page_title do
    = t('admin.trends.preview_card_providers.title')
  
 -- content_for :header_tags do
 -  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 -
+ %p= t('admin.trends.preview_card_providers.description_html')
+ 
+ %hr.spacer/
+ 
  .filters
    .filter-subset
      %strong= t('admin.tags.review')

diff --cc app/views/admin/trends/statuses/index.html.haml
index 3166bc6c11eda4293d10137457b682c97981ec22,b0059b20d70b6bc0eb23286e08efbf5aaff927a1..c96f4323a99b5faa64a2fd0eb00957f69de96722
--- 1/app/views/admin/trends/statuses/index.html.haml
--- 2/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@@ -1,6 -1,13 +1,10 @@@
  - content_for :page_title do
    = t('admin.trends.statuses.title')
  
 -- content_for :header_tags do
 -  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 -
+ %p= t('admin.trends.statuses.description_html')
+ 
+ %hr.spacer/
+ 
  = form_tag admin_trends_statuses_path, method: 'GET', class: 'simple_form' do
    - Trends::StatusFilter::KEYS.each do |key|
      = hidden_field_tag key, params[key] if params[key].present?

diff --cc app/views/admin/trends/tags/index.html.haml
index 3433b8dd4c0295c206fa05fcfb77fbe5e78d9da6,bde32a29528bb8a791f91f49eae72c845e831caf..ac9bf91db65a07834ae3b15ee4436f1a43467772
--- 1/app/views/admin/trends/tags/index.html.haml
--- 2/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@@ -1,6 -1,13 +1,10 @@@
  - content_for :page_title do
    = t('admin.trends.tags.title')
  
 -- content_for :header_tags do
 -  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 -
+ %p= t('admin.trends.tags.description_html')
+ 
+ %hr.spacer/
+ 
  .filters
    .filter-subset
      %strong= t('admin.tags.review')