Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2024-01-16 12:04:11 +01:00
110 changed files with 255 additions and 251 deletions

View File

@@ -22,7 +22,7 @@ def find_used_icons
Dir[Rails.root.join('app', 'javascript', '**', '*.*s*')].map do |path|
File.open(path, 'r') do |file|
pattern = %r{\Aimport .* from 'mastodon/../material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
pattern = %r{\Aimport .* from '@/material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
file.each_line do |line|
match = pattern.match(line)
next if match.blank?