projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8d01aaa
bc2e98b
)
Merge branch 'cancel-follow-request' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Fri, 7 Feb 2020 16:10:43 +0000
(16:10 +0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Fri, 7 Feb 2020 16:10:43 +0000
(16:10 +0000)
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
1
2
CHANGELOG.md
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/utils.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/common_api/common_api_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CHANGELOG.md
Simple merge
diff --cc
lib/pleroma/web/activity_pub/utils.ex
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc
test/web/common_api/common_api_test.exs
Simple merge
projects / akkoma / commitdiff