projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
74d8fad
b7f27a4
)
Merge branch 'split-masto-api/reports' into 'develop'
author
kaniini
<ariadne@dereferenced.org>
Mon, 30 Sep 2019 11:17:30 +0000
(11:17 +0000)
committer
kaniini
<ariadne@dereferenced.org>
Mon, 30 Sep 2019 11:17:30 +0000
(11:17 +0000)
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
1
2
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff