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

5fbb14f5

Commit 5fbb14f5 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'bugfix/federation-kroeg' into 'develop'

fix federation with kroeg

See merge request pleroma/pleroma!272

parents 38361e7b 80584436

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/activity_pub/transmogrifier.ex 26 additions, 1 deletion

lib/pleroma/web/activity_pub/transmogrifier.ex
test/fixtures/httpoison_mock/puckipedia.com.json 1 addition, 0 deletions

test/fixtures/httpoison_mock/puckipedia.com.json
test/fixtures/kroeg-post-activity.json 50 additions, 0 deletions

test/fixtures/kroeg-post-activity.json
test/support/httpoison_mock.ex 8 additions, 0 deletions

test/support/httpoison_mock.ex
test/web/activity_pub/transmogrifier_test.exs 9 additions, 0 deletions

test/web/activity_pub/transmogrifier_test.exs

with 94 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