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

2024-11-13 08:17:38 +09:00 · 2024-11-13 08:17:38 +09:00 · 910eafda63
commit 910eafda63
parent a41f51501c 2bd56f726a
177 changed files with 1625 additions and 659 deletions
--- a/app/models/software_update.rb
+++ b/app/models/software_update.rb
@ -24,7 +24,7 @@ class SoftwareUpdate < ApplicationRecord

  class << self
    def check_enabled?
-      ENV['UPDATE_CHECK_URL'] != ''
+      Rails.configuration.x.mastodon.software_update_url.present?
    end

    def pending_to_a