about summary refs log tree commit diff
path: root/app/serializers
diff options
context:
space:
mode:
authorReverite <github@reverite.sh>2019-04-01 13:28:33 -0700
committerReverite <github@reverite.sh>2019-04-01 13:28:33 -0700
commitff736905fa534f7189e57c1d0c14fbac45f239a1 (patch)
tree4502f6d993ba60bd4ab68f41a53a642901d244fd /app/serializers
parent4d77314005483e53e320a82c87805c6bcca1c463 (diff)
parent3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/rest/relationship_serializer.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb
index 1a3fd915c..c6c722a54 100644
--- a/app/serializers/rest/relationship_serializer.rb
+++ b/app/serializers/rest/relationship_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::RelationshipSerializer < ActiveModel::Serializer
-  attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :blocked_by,
+  attributes :id, :following, :showing_reblogs, :followed_by, :blocking,
              :muting, :muting_notifications, :requested, :domain_blocking,
              :endorsed
 
@@ -27,10 +27,6 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
     instance_options[:relationships].blocking[object.id] || false
   end
 
-  def blocked_by
-    instance_options[:relationships].blocked_by[object.id] || false
-  end
-
   def muting
     instance_options[:relationships].muting[object.id] ? true : false
   end