diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:03:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 23:03:07 -0400 |
commit | ae9d2f4a32f07362e4d0ed18f0885f3b81eb801d (patch) | |
tree | 04006f15ff50da8cf8772f30fe7f59e9d5df2deb /app/views/stream_entries/_status.html.haml | |
parent | 8e7d0bda403d912d2992e53eaa949fd0bdaf464f (diff) | |
parent | a25a384af3d08a05bc0907261f76410da36cbb10 (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 } |