Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 2 Mar 2020 07:58:01 +0000 (07:58 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 2 Mar 2020 07:58:01 +0000 (07:58 +0000)
ActivityPub actions & side-effects in transaction

Closes #1482

See merge request pleroma/pleroma!2089

1  2 
lib/pleroma/object.ex
lib/pleroma/pagination.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs

Simple merge
Simple merge
Simple merge