gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

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

Browse source
This commit is contained in:
KMY 2024-01-18 09:17:39 +09:00
commit 2b51fabe9c
397 changed files with 2899 additions and 3252 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/tasks/db.rake
View file

@ -15,7 +15,7 @@ namespace :db do
end
end
task :pre_migration_check do
task pre_migration_check: :environment do
version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
end

2
lib/tasks/icons.rake
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?