projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2ba70e
9ea51a6
)
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
author
lain
<lain@soykaf.club>
Thu, 23 Jul 2020 12:52:02 +0000
(12:52 +0000)
committer
lain
<lain@soykaf.club>
Thu, 23 Jul 2020 12:52:02 +0000
(12:52 +0000)
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
1
2
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
mix.lock
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/transmogrifier_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
Simple merge
diff --cc
mix.lock
Simple merge
diff --cc
test/web/activity_pub/transmogrifier_test.exs
Simple merge
projects / akkoma / commitdiff