Merge remote-tracking branch 'parent/main' into upstream-20240618
This commit is contained in:
commit
aa2cdc898a
271 changed files with 1839 additions and 1397 deletions
|
@ -15,8 +15,8 @@ module Admin::ActionLogsHelper
|
|||
link_to log.human_identifier, admin_roles_path(log.target_id)
|
||||
when 'Report'
|
||||
link_to "##{log.human_identifier.presence || log.target_id}", admin_report_path(log.target_id)
|
||||
when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock', 'UnavailableDomain'
|
||||
link_to log.human_identifier, "https://#{log.human_identifier.presence}"
|
||||
when 'Instance', 'DomainBlock', 'DomainAllow', 'UnavailableDomain'
|
||||
log.human_identifier.present? ? link_to(log.human_identifier, admin_instance_path(log.human_identifier)) : I18n.t('admin.action_logs.unavailable_instance')
|
||||
when 'Status'
|
||||
link_to log.human_identifier, log.permalink
|
||||
when 'AccountWarning'
|
||||
|
@ -25,7 +25,7 @@ module Admin::ActionLogsHelper
|
|||
link_to truncate(log.human_identifier), edit_admin_announcement_path(log.target_id)
|
||||
when 'CustomEmoji'
|
||||
link_to log.human_identifier, edit_admin_custom_emoji_path(log.target_id)
|
||||
when 'IpBlock', 'Instance'
|
||||
when 'IpBlock', 'EmailDomainBlock'
|
||||
log.human_identifier
|
||||
when 'CanonicalEmailBlock'
|
||||
content_tag(:samp, (log.human_identifier.presence || '')[0...7], title: log.human_identifier)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue