diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:43:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:43:13 -0400 |
| commit | 38c51309300790e0f4a3fed0ede387c1765633a6 (patch) | |
| tree | 5fc14c684d9ee4b21eb7710c491b3573df6e0034 /app/views/stream_entries | |
| parent | b5d87500d2600eb8a0a56b0caeca5c7be388df19 (diff) | |
| parent | ee8af9083ae83c6c642fa00aff040fb971f13470 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/show.atom.ruby | 9 |
2 files changed, 1 insertions, 10 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 } diff --git a/app/views/stream_entries/show.atom.ruby b/app/views/stream_entries/show.atom.ruby deleted file mode 100644 index a298f3269..000000000 --- a/app/views/stream_entries/show.atom.ruby +++ /dev/null @@ -1,9 +0,0 @@ -Nokogiri::XML::Builder.new do |xml| - entry(xml, true) do - author(xml) do - include_author xml, @stream_entry.account - end - - include_entry xml, @stream_entry - end -end.to_xml |