Merge branch 'main' into glitch-soc/merge-upstream

2021-05-12 11:03:05 +02:00
parent ffc3f8eebe 70f6f2e9b7
commit dc58d02192
23 changed files with 135 additions and 35 deletions
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@ -177,7 +177,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
    end

    def href
-      explore_hashtag_url(object)
+      tag_url(object)
    end

    def name