diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-21 09:23:35 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-21 09:23:35 +0300 |
| commit | 41e233200730dca4a0d6d846d44653eef4de0fec (patch) | |
| tree | 2920b8740145114b034fcdc860b2bc1b89f406dc /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | a5db044e579ed9923e610cdf89dff6146d9b0986 (diff) | |
| parent | ab36459464311389c2929ff1c48537889066a9f8 (diff) | |
| download | pleroma-41e233200730dca4a0d6d846d44653eef4de0fec.tar.gz | |
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 529169c1b..7118faf94 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -75,7 +75,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do plug( OAuthScopesPlug, %{scopes: ["write:reports"], admin: true} - when action in [:report_update_state, :report_respond] + when action in [:reports_update] ) plug( @@ -639,7 +639,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do def force_password_reset(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do users = nicknames |> Enum.map(&User.get_cached_by_nickname/1) - Enum.map(users, &User.force_password_reset_async/1) + Enum.each(users, &User.force_password_reset_async/1) ModerationLog.insert_log(%{ actor: admin, |