Fix merge issues

This commit is contained in:
Renato "Lond" Cerqueira
2019-06-30 10:55:00 +02:00
parent f0a512c7ca
commit 405d6a71c8
12 changed files with 60 additions and 2 deletions

View File

@ -21,7 +21,7 @@ class StreamEntriesController < ApplicationController
end
format.atom do
expires_in 3.minutes, public: true unless @stream_entry.hidden?
expires_in 3.minutes, public: true unless @stream_entry.hidden? || @stream_entry.local_only?
render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.entry(@stream_entry, true))
end