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/services/software_update_check_service.rb
+++ b/app/services/software_update_check_service.rb
@ -27,7 +27,7 @@ class SoftwareUpdateCheckService < BaseService
  end

  def api_url
-    ENV.fetch('UPDATE_CHECK_URL', 'https://kmy.blue/update-check')
+    Rails.configuration.x.mastodon.software_update_url
  end

  def version