Merge remote-tracking branch 'parent/main' into upstream-20231027

This commit is contained in:
KMY 2023-10-27 08:35:05 +09:00
commit 26ecad7067
53 changed files with 397 additions and 294 deletions

View file

@ -21,7 +21,7 @@ module Admin
account_action.save!
if account_action.with_report?
redirect_to admin_reports_path, notice: I18n.t('admin.reports.processed_msg', id: params[:report_id])
redirect_to admin_reports_path, notice: I18n.t('admin.reports.processed_msg', id: resource_params[:report_id])
else
redirect_to admin_account_path(@account.id)
end