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

764a50f8

Commit 764a50f8 authored 5 years ago by Haelwenn

Downloads
- Plain Diff

Merge branch 'feature/1482-activity_pub_transactions' into 'develop'

ActivityPub actions & side-effects in transaction

Closes #1482

See merge request pleroma/pleroma!2089

parents 6ceef768 34f1d09f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
lib/pleroma/object.ex 12 additions, 12 deletions

lib/pleroma/object.ex
lib/pleroma/pagination.ex 4 additions, 0 deletions

lib/pleroma/pagination.ex
lib/pleroma/upload.ex 1 addition, 0 deletions

lib/pleroma/upload.ex
lib/pleroma/user.ex 10 additions, 1 deletion

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex 159 additions, 33 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
mix.lock 1 addition, 0 deletions

mix.lock
test/web/activity_pub/activity_pub_test.exs 203 additions, 18 deletions

test/web/activity_pub/activity_pub_test.exs

with 392 additions and 64 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