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

9e9d95ec

Commit 9e9d95ec authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma...

Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus

parents f1ebf812 7561158a

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 1 deletion

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/federator/federator.ex 32 additions, 0 deletions

lib/pleroma/web/federator/federator.ex
lib/pleroma/web/salmon/salmon.ex 55 additions, 1 deletion

lib/pleroma/web/salmon/salmon.ex
lib/pleroma/web/websub/websub.ex 21 additions, 5 deletions

lib/pleroma/web/websub/websub.ex
lib/pleroma/web/websub/websub_client_subscription.ex 13 additions, 0 deletions

lib/pleroma/web/websub/websub_client_subscription.ex
priv/repo/migrations/20170426154155_create_websub_client_subscription.exs 15 additions, 0 deletions

...ions/20170426154155_create_websub_client_subscription.exs
test/fixtures/private_key.pem 27 additions, 0 deletions

test/fixtures/private_key.pem
test/web/salmon/salmon_test.exs 33 additions, 0 deletions

test/web/salmon/salmon_test.exs
test/web/websub/websub_test.exs 11 additions, 1 deletion

test/web/websub/websub_test.exs

with 208 additions and 8 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