From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 2 Mar 2022 19:48:27 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8743b1ea40425a83cc72834e823320439fd2fa02;p=mastodon.git

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.
---

8743b1ea40425a83cc72834e823320439fd2fa02
diff --cc app/views/admin/trends/links/index.html.haml
index e05f877b0,49a53d979..6f090df7b
--- a/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 13c279b53,c3648c35e..222ff6bda
--- a/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 3166bc6c1,b0059b20d..c96f4323a
--- a/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 3433b8dd4,bde32a295..ac9bf91db
--- a/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')