diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
| commit | c56a504d116d62fe669d15a270133d7c78dd61f1 (patch) | |
| tree | 7400f3182f2a4ebd1606c37a1a5cad4cc95e443b /app/views/relationships | |
| parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
| parent | c2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.
Diffstat (limited to 'app/views/relationships')
| -rw-r--r-- | app/views/relationships/_account.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/relationships/_account.html.haml b/app/views/relationships/_account.html.haml index 6c22deb51..af5a4aaf7 100644 --- a/app/views/relationships/_account.html.haml +++ b/app/views/relationships/_account.html.haml @@ -14,7 +14,7 @@ %small= t('accounts.followers', count: account.followers_count).downcase %td.accounts-table__count - if account.last_status_at.present? - %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at + %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at - else \- %small= t('accounts.last_active') |