Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

3dc5f049

Commit 3dc5f049 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'carrot-bullying' into 'develop'

Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595

parents dd8f2196 9c782e59

Branches

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 2 additions, 1 deletion

config/config.exs
docs/config.md 1 addition, 0 deletions

docs/config.md
lib/pleroma/web/activity_pub/activity_pub.ex 8 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs 18 additions, 0 deletions

test/web/activity_pub/activity_pub_test.exs

with 29 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment