projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd8f219 9c782e5)
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)
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595

1  2 
config/config.exs patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history
test/web/activity_pub/activity_pub_test.exs patch | diff1 | diff2 | blob | history

diff --cc config/config.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git