Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members

Snippets Groups Projects

bea69853

Commit bea69853 authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff

parents 0ec7e9b8 b3c36d3f

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

config/test.exs 4 additions, 0 deletions

config/test.exs
lib/pleroma/logging.ex 7 additions, 0 deletions

lib/pleroma/logging.ex
lib/pleroma/web/activity_pub/activity_pub.ex 5 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/activity_pub/streaming.ex 12 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub/streaming.ex
lib/pleroma/web/activity_pub/side_effects.ex 5 additions, 3 deletions

lib/pleroma/web/activity_pub/side_effects.ex
test/pleroma/web/activity_pub/side_effects/delete_test.exs 147 additions, 0 deletions

test/pleroma/web/activity_pub/side_effects/delete_test.exs
test/pleroma/web/activity_pub/side_effects_test.exs 0 additions, 110 deletions

test/pleroma/web/activity_pub/side_effects_test.exs
test/support/conn_case.ex 2 additions, 0 deletions

test/support/conn_case.ex
test/support/data_case.ex 2 additions, 0 deletions

test/support/data_case.ex
test/support/mocks.ex 6 additions, 1 deletion

test/support/mocks.ex

with 190 additions and 114 deletions

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