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

This commit is contained in:
KMY 2025-01-09 13:20:56 +09:00
commit d35fa72842
333 changed files with 4444 additions and 2541 deletions

View file

@ -56,7 +56,7 @@ class AdminMailer < ApplicationMailer
end
def new_software_updates
@software_updates = SoftwareUpdate.all.to_a.sort_by(&:gem_version)
@software_updates = SoftwareUpdate.by_version
locale_for_account(@me) do
mail subject: default_i18n_subject(instance: @instance)
@ -64,7 +64,7 @@ class AdminMailer < ApplicationMailer
end
def new_critical_software_updates
@software_updates = SoftwareUpdate.where(urgent: true).to_a.sort_by(&:gem_version)
@software_updates = SoftwareUpdate.urgent.by_version
locale_for_account(@me) do
mail subject: default_i18n_subject(instance: @instance)