diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:08:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:08:54 -0400 |
| commit | 05be34a94b79eaae7d1c4a66eb943b388940636d (patch) | |
| tree | 944d1431693e13a4a68ae5584269211b2215e17c /app/views/stream_entries | |
| parent | 41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (diff) | |
| parent | cb58694a81093230d1069040177de7f688c56d0d (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/views/stream_entries')
| -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 } |