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

2020-12-09 14:42:33 +01:00
parent 25f725d67a 127c543a6e
commit a16175645d
23 changed files with 235 additions and 212 deletions
--- a/app/serializers/rest/account_featured_tag_serializer.rb
+++ b/app/serializers/rest/account_featured_tag_serializer.rb
@@ -9,10 +9,6 @@ class REST::AccountFeaturedTagSerializer < ActiveModel::Serializer
    object.tag.id.to_s
  end

-  def name
-    "##{object.name}"
-  end
-
  def url
    short_account_tag_url(object.account, object.tag)
  end