diff options
| author | feld <feld@feld.me> | 2020-12-17 16:00:30 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-12-17 16:00:30 +0000 |
| commit | ff7f7416f70591439579fd370aaebd4fb4b21249 (patch) | |
| tree | 915321403b8a1639fa317b72d438b8a61a0eb090 /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | |
| parent | 8b8c317c0ff1534d3296369ba315b8919e8dc55c (diff) | |
| parent | 80891e83d8df25b742a321d2c837e38c805e6582 (diff) | |
| download | pleroma-ff7f7416f70591439579fd370aaebd4fb4b21249.tar.gz | |
Merge branch 'registration-workflow' into 'develop'
Improve registration workflow, fixes #2175
Closes #2235 and #2175
See merge request pleroma/pleroma!3068
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex index 5c2c282b3..75525104f 100644 --- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex @@ -415,7 +415,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do def confirm_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do users = Enum.map(nicknames, &User.get_cached_by_nickname/1) - User.toggle_confirmation(users) + User.confirm(users) ModerationLog.insert_log(%{actor: admin, subject: users, action: "confirm_email"}) |