diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:48:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:48:19 -0400 |
commit | 5dfc9854f1612bc7e55524175170fd40c7dbe21a (patch) | |
tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /app/views/stream_entries/_status.html.haml | |
parent | 9cf0b5b2557a6e26542a39c3fb31f46a15073662 (diff) | |
parent | b300bb3b4e45d7e52a5a0f2db3c9ed383fc4ebbb (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 } |