diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:11:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:11:24 -0400 |
commit | 451b7431c9d0a8bb34642d5af599bc48701376d2 (patch) | |
tree | 1be076bbade89fa78872d09b8961b5a183230e25 /app/views/stream_entries/_status.html.haml | |
parent | 8fa8004a2b090a3911cce11473bb926ebd6782a6 (diff) | |
parent | 530725ba3c4fefc6fd3e45cda588daa5af2ea9ec (diff) |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/views/stream_entries/_status.html.haml')
-rw-r--r-- | app/views/stream_entries/_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index cdd0dde3b..434c5c8da 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -16,7 +16,7 @@ %strong= display_name(status.account) = t('stream_entries.reblogged') - = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) } + = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: status.proper } - if include_threads = render partial: 'stream_entries/status', collection: @descendants, as: :status, locals: { is_successor: true } |