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

2025-03-10 19:58:05 +09:00 · 2025-03-10 19:58:05 +09:00 · 5979c0ea1d
commit 5979c0ea1d
parent 69d5383d1f 207029eb2f
345 changed files with 4304 additions and 2540 deletions
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@ -61,6 +61,9 @@ class REST::InstanceSerializer < ActiveModel::Serializer
      urls: {
        streaming: Rails.configuration.x.streaming_api_base_url,
        status: object.status_page_url,
+        about: about_url,
+        privacy_policy: privacy_policy_url,
+        terms_of_service: TermsOfService.live.exists? ? terms_of_service_url : nil,
      },

      vapid: {