From 125322718bfe983e94937f5d127003d47a138313 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 2 Nov 2022 18:50:21 +0100
Subject: [PATCH] Fix inaccurate admin log entry for re-sending confirmation
e-mails (#19674)
Fixes #19593
---
app/controllers/admin/confirmations_controller.rb | 2 +-
app/models/admin/action_log_filter.rb | 1 +
config/locales/en.yml | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/controllers/admin/confirmations_controller.rb b/app/controllers/admin/confirmations_controller.rb
index efe7dcbd4b..6f4e426797 100644
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@@ -17,7 +17,7 @@ module Admin
@user.resend_confirmation_instructions
- log_action :confirm, @user
+ log_action :resend, @user
flash[:notice] = I18n.t('admin.accounts.resend_confirmation.success')
redirect_to admin_accounts_path
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index c7a7e1a4c3..edb391e2e8 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -47,6 +47,7 @@ class Admin::ActionLogFilter
promote_user: { target_type: 'User', action: 'promote' }.freeze,
remove_avatar_user: { target_type: 'User', action: 'remove_avatar' }.freeze,
reopen_report: { target_type: 'Report', action: 'reopen' }.freeze,
+ resend_user: { target_type: 'User', action: 'resend' }.freeze,
reset_password_user: { target_type: 'User', action: 'reset_password' }.freeze,
resolve_report: { target_type: 'Report', action: 'resolve' }.freeze,
sensitive_account: { target_type: 'Account', action: 'sensitive' }.freeze,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 547b19f074..ce8dea65b3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -207,6 +207,7 @@ en:
reject_user: Reject User
remove_avatar_user: Remove Avatar
reopen_report: Reopen Report
+ resend_user: Resend Confirmation Mail
reset_password_user: Reset Password
resolve_report: Resolve Report
sensitive_account: Force-Sensitive Account
@@ -265,6 +266,7 @@ en:
reject_user_html: "%{name} rejected sign-up from %{target}"
remove_avatar_user_html: "%{name} removed %{target}'s avatar"
reopen_report_html: "%{name} reopened report %{target}"
+ resend_user_html: "%{name} resent confirmation e-mail for %{target}"
reset_password_user_html: "%{name} reset password of user %{target}"
resolve_report_html: "%{name} resolved report %{target}"
sensitive_account_html: "%{name} marked %{target}'s media as sensitive"
--
GitLab