projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d96f8f1
8062d59
)
Merge branch 'restricted-relations-embedding' into 'develop'
author
lain
<lain@soykaf.club>
Sun, 17 May 2020 07:26:51 +0000
(07:26 +0000)
committer
lain
<lain@soykaf.club>
Sun, 17 May 2020 07:26:51 +0000
(07:26 +0000)
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
1
2
lib/pleroma/web/admin_api/admin_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/api_spec/helpers.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/api_spec/operations/account_operation.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/api_spec/operations/status_operation.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/api_spec/helpers.ex
Simple merge
diff --cc
lib/pleroma/web/api_spec/operations/account_operation.ex
Simple merge
diff --cc
lib/pleroma/web/api_spec/operations/status_operation.ex
Simple merge
diff --cc
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
Simple merge
projects / akkoma / commitdiff