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/admin/instances | |
| 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/admin/instances')
| -rw-r--r-- | app/views/admin/instances/_instance.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml index 990cf9ec8..dc81007ac 100644 --- a/app/views/admin/instances/_instance.html.haml +++ b/app/views/admin/instances/_instance.html.haml @@ -30,4 +30,4 @@ = ' / ' %span.negative-hint = t('admin.instances.delivery.unavailable_message') - .trends__item__current{ title: t('admin.instances.known_accounts', count: instance.accounts_count) }= number_to_human instance.accounts_count, strip_insignificant_zeros: true + .trends__item__current{ title: t('admin.instances.known_accounts', count: instance.accounts_count) }= friendly_number_to_human instance.accounts_count |