projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b73b173
f21f538
)
Merge branch 'feature/delete-validator' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Wed, 6 May 2020 14:32:58 +0000
(14:32 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Wed, 6 May 2020 14:32:58 +0000
(14:32 +0000)
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/admin_api/admin_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/admin_api/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub_controller.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc
lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc
test/web/admin_api/admin_api_controller_test.exs
Simple merge