tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
This commit is contained in:
Claire
2023-06-10 16:22:14 +02:00
parent 9e66c07be7 1483a3ddfe
commit d8b0a732aa
68 changed files with 837 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/admin/trends/links/_preview_card.html.haml
View File

@@ -10,21 +10,21 @@
- if preview_card.provider_name.present?
= preview_card.provider_name
•
·
- if preview_card.language.present?
= standard_locale_name(preview_card.language)
•
·
= t('admin.trends.links.shared_by_over_week', count: preview_card.history.reduce(0) { |sum, day| sum + day.accounts })
- if preview_card.trend.allowed?
•
·
%abbr{ title: t('admin.trends.tags.current_score', score: preview_card.trend.score) }= t('admin.trends.tags.trending_rank', rank: preview_card.trend.rank)
- if preview_card.decaying?
•
·
= t('admin.trends.tags.peaked_on_and_decaying', date: l(preview_card.max_score_at.to_date, format: :short))
- elsif preview_card.requires_review?
•
·
= t('admin.trends.pending_review')