diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-02 20:48:27 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-02 20:48:27 +0100 |
commit | 8743b1ea40425a83cc72834e823320439fd2fa02 (patch) | |
tree | 0bdfaca0357df1326bd3efb2e1a8319e719a2047 /app/views/admin/trends/links/index.html.haml | |
parent | d9e30efa5ecc87bc9be7b2e28baaf34bd01032f5 (diff) | |
parent | c0c4b5718d8827fc59d5564c227e848547a2cb69 (diff) |
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.
Diffstat (limited to 'app/views/admin/trends/links/index.html.haml')
-rw-r--r-- | app/views/admin/trends/links/index.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml index e05f877b0..6f090df7b 100644 --- a/app/views/admin/trends/links/index.html.haml +++ b/app/views/admin/trends/links/index.html.haml @@ -1,6 +1,10 @@ - content_for :page_title do = t('admin.trends.links.title') +%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? |