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

This commit is contained in:
KMY 2024-04-24 08:57:07 +09:00
commit 32a8f367a3
91 changed files with 1073 additions and 446 deletions

View file

@ -12,11 +12,11 @@
.back-link
- if params[:report_id]
= link_to admin_report_path(params[:report_id].to_i) do
= fa_icon 'chevron-left fw'
= material_symbol 'chevron_left'
= t('admin.statuses.back_to_report')
- else
= link_to admin_account_path(@account.id) do
= fa_icon 'chevron-left fw'
= material_symbol 'chevron_left'
= t('admin.statuses.back_to_account')
%hr.spacer/