projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6977500
0ba1f26
)
Merge branch 'openapi/admin/oauth-apps' into 'develop'
author
lain
<lain@soykaf.club>
Tue, 2 Jun 2020 14:13:24 +0000
(14:13 +0000)
committer
lain
<lain@soykaf.club>
Tue, 2 Jun 2020 14:13:24 +0000
(14:13 +0000)
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
1
2
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/admin_api/controllers/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge