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

dfde2622

Commit dfde2622 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'activitypub-c2s' into 'develop'

Activitypub c2s

See merge request pleroma/pleroma!608

parents f5d7b000 f40562b4

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/activity_pub_controller.ex 55 additions, 7 deletions

lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/activity_pub/views/user_view.ex 47 additions, 0 deletions

lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/router.ex 21 additions, 0 deletions

lib/pleroma/web/router.ex
test/fixtures/activitypub-client-post-activity.json 9 additions, 0 deletions

test/fixtures/activitypub-client-post-activity.json
test/web/activity_pub/activity_pub_controller_test.exs 54 additions, 0 deletions

test/web/activity_pub/activity_pub_controller_test.exs

with 186 additions and 7 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