Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

24c8c136

Commit 24c8c136 authored 4 years ago by rinpatch

Downloads
- Plain Diff

Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'

ActivityPub: Fix non-federating blocks.

Closes #1757

See merge request pleroma/pleroma!2514

parents 4cc71aad d0ba1844

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 3 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex 6 additions, 2 deletions

lib/pleroma/web/activity_pub/utils.ex
test/web/activity_pub/activity_pub_test.exs 28 additions, 4 deletions

test/web/activity_pub/activity_pub_test.exs

with 35 additions and 9 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