hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/reports-groups-and-multiple-state-update

Browse source
This commit is contained in:
Maxim Filippov 2019-11-08 18:30:49 +09:00
commit b14bf9044f
18 changed files with 148 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/web/admin_api/admin_api_controller_test.exs
View file

@ -2760,7 +2760,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
conn =
build_conn()
|> assign(:user, admin)
|> patch("/api/pleroma/admin/users/#{user.nickname}/force_password_reset")
|> patch("/api/pleroma/admin/users/force_password_reset", %{nicknames: [user.nickname]})
assert json_response(conn, 204) == ""