From 4931eac28003aed8a35ce6c7c499840c92cc3af5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 12 Sep 2017 00:57:18 +0200
Subject: [PATCH] Fix nil error for old toots that don't have a conversation
(#4900)
---
app/serializers/activitypub/note_serializer.rb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index d42f542639..7d53537b50 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -73,6 +73,8 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
end
def conversation
+ return if object.conversation.nil?
+
if object.conversation.uri?
object.conversation.uri
else
--
GitLab