Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
12532271
Unverified
Commit
12532271
authored
2 years ago
by
Claire
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674)
Fixes #19593
parent
74d40c7d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/controllers/admin/confirmations_controller.rb
+1
-1
1 addition, 1 deletion
app/controllers/admin/confirmations_controller.rb
app/models/admin/action_log_filter.rb
+1
-0
1 addition, 0 deletions
app/models/admin/action_log_filter.rb
config/locales/en.yml
+2
-0
2 additions, 0 deletions
config/locales/en.yml
with
4 additions
and
1 deletion
app/controllers/admin/confirmations_controller.rb
+
1
−
1
View file @
12532271
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
app/models/admin/action_log_filter.rb
+
1
−
0
View file @
12532271
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
config/locales/en.yml
+
2
−
0
View file @
12532271
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment