diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:34:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:34:41 -0400 |
commit | bc237d17a71320829dce55d8dca4013d5f772665 (patch) | |
tree | 006e8e3df6d3ba1e9967c32cc7d27885d0a19914 /app/views/stream_entries/_status.html.haml | |
parent | c441208e29cc86cbf514851879bdaa9130351b22 (diff) | |
parent | a872f2f4c64f4a370fa1a92a28f9c07c1dd3b06d (diff) |
Merge branch 'master' into patch-1
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 } |