projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fbf02a3
13cce9c
)
Merge branch 'admin-api-change-password' into 'develop'
author
lain
<lain@soykaf.club>
Tue, 24 Mar 2020 17:34:13 +0000
(17:34 +0000)
committer
lain
<lain@soykaf.club>
Tue, 24 Mar 2020 17:34:13 +0000
(17:34 +0000)
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
1
2
CHANGELOG.md
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/admin_api/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CHANGELOG.md
Simple merge
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
test/web/admin_api/admin_api_controller_test.exs
Simple merge