Merge tag 'v3.0.0' into hometown-dev

This commit is contained in:
Darius Kazemi
2019-10-08 13:24:20 -07:00
1012 changed files with 31176 additions and 15165 deletions

View File

@ -58,7 +58,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
end
def uri
OStatus::TagManager.instance.uri_for(object)
ActivityPub::TagManager.instance.uri_for(object)
end
def activity_pub_type
@ -70,7 +70,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
end
def url
TagManager.instance.url_for(object)
ActivityPub::TagManager.instance.url_for(object)
end
def favourited
@ -136,7 +136,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
end
def url
TagManager.instance.url_for(object.account)
ActivityPub::TagManager.instance.url_for(object.account)
end
def acct