Merge branch 'fix/blocked-user-boosts' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)
commita7a40bb8f1eaf30f0f0d581089ff3ef45de4087c
tree83490dd67bb54fa88372cbd6169960bb25de3234
parent39c80a3667afec25a187894d67e0d0e9b8713eb1
parent48380aecccc74b0a376ed1efb55a269b35516566
Merge branch 'fix/blocked-user-boosts' into 'develop'

ActivityPub.ex: do not return boosted statuses from blocked users.

See merge request pleroma/pleroma!111
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs