diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:34:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:34:45 -0400 |
| commit | cf03634e74364af3a703ea09073ab0a58448d460 (patch) | |
| tree | d4454c7feaa75a99532d4a5cd9bfdff8b4c8bf09 /app/views/stream_entries/_status.html.haml | |
| parent | 83530f0eef8f6cf04321b61c917da08ab0f4e323 (diff) | |
| parent | 698d74a15fe8db61de057b8876e9967e9e9c7330 (diff) | |
Merge branch 'master' into add-elao-com-instance
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 } |