Merge branch 'carrot-bullying' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 29 Dec 2018 11:46:06 +0000 (11:46 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 29 Dec 2018 11:46:06 +0000 (11:46 +0000)
commit3dc5f04976293fbcedfc01281f89c4f54c995d59
treea5f7fc71bdd0e9a77874d56b8034c7c181883d97
parentdd8f2196f62ab4d4cdec67bdb2b434a317a3f396
parent9c782e59ddac5fa01cd5b2517f282b283f01bc1d
Merge branch 'carrot-bullying' into 'develop'

Add some hard limits on inserted activities.

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