about summary refs log tree commit diff
path: root/app/serializers/rest
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-04-01 21:36:36 +0200
committerGitHub <noreply@github.com>2019-04-01 21:36:36 +0200
commit3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (patch)
tree4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /app/serializers/rest
parent925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff)
parent12dae9d58316bec32adaac016998ab1cf69d2b45 (diff)
Merge pull request #978 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest')
-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