diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
| commit | a817f084eafaf5527445c29ab1d68f42b1a2872f (patch) | |
| tree | f146e6c8ff958d60804e33e40e1970784f5b7b90 /app/views/stream_entries | |
| parent | eb72c3398cd70c6b595fae5a0cb6730a3e49bd61 (diff) | |
| parent | 8e88a18316d45a459a31d67487bccc247592d187 (diff) | |
Merge remote-tracking branch 'tootsuite/master'
Conflicts: app/controllers/statuses_controller.rb
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index e2e1fdd12..2d0dafcb7 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -14,6 +14,10 @@ entry_classes = h_class + ' ' + mf_classes + ' ' + style_classes - if status.reply? && include_threads + - if @next_ancestor + .entry{ class: entry_classes } + = link_to short_account_status_url(@next_ancestor.account.username, @next_ancestor), class: 'more light' do + = t('statuses.show_more') = render partial: 'stream_entries/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id } .entry{ class: entry_classes } |