diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-30 14:20:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 14:20:25 +0100 |
| commit | 7f24242ef6d3e6b64f9116dedc3ad60048b4c1bc (patch) | |
| tree | da19d2883856a99ba2a0b7caddff8b67683a070a /app/services | |
| parent | 7ec3f6022d5c991bb584c481a29c416e9f1c5438 (diff) | |
| parent | 48be335f4f64c5513bb4b0d760225ceca78416c2 (diff) | |
Merge pull request #801 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/notify_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 49022a844..a8b7bb30b 100644 --- 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? |