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

2018-10-30 11:22:25 +01:00
parent 7ec3f6022d 6771e8c88c
commit 94ad76a5b9
6 changed files with 34 additions and 32 deletions
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -31,7 +31,7 @@ class NotifyService < BaseService
  end

  def blocked_reblog?
-    @recipient.muting_reblogs?(@notification.from_account)
+    false
  end

  def blocked_follow_request?