diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:49:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:49:14 -0400 |
commit | b67b60fec3adecffef544924a7776cce9b0a2633 (patch) | |
tree | b592548a0a8cc6e9f1cbdf91df04e197503c070f /app/views/stream_entries/_status.html.haml | |
parent | acf6436a993b514aa2fffffb8a03d3718c5a49a0 (diff) | |
parent | cc16fa75137586dff8eb1ef4e508aed81bf21718 (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 } |