diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-07-08 16:17:19 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-08 16:17:19 +0200 |
commit | 3160e050a95afe47317e82956f055a5ab6030698 (patch) | |
tree | 957699d2b99e6d0024560d790a011a30e60ddd3b /app/views/settings | |
parent | 0c2eb949fc21ceecbd99a81e5ffe75517a1e64df (diff) | |
parent | c4568e3b606cc4007739f881c334bdfe8dc77745 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.
Diffstat (limited to 'app/views/settings')
-rw-r--r-- | app/views/settings/featured_tags/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml index 297379893..65de7f8f3 100644 --- a/app/views/settings/featured_tags/index.html.haml +++ b/app/views/settings/featured_tags/index.html.haml @@ -28,4 +28,4 @@ - else %time{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at = table_link_to 'trash', t('filters.index.delete'), settings_featured_tag_path(featured_tag), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } - .trends__item__current= number_to_human featured_tag.statuses_count, strip_insignificant_zeros: true + .trends__item__current= friendly_number_to_human featured_tag.statuses_count |