Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream

2025-12-15 08:48:53 +00:00 · 2025-03-07 17:37:36 +01:00
parent cb1ff94582 b57687083f
commit dbd3e05812
94 changed files with 280 additions and 146 deletions
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -59,6 +59,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: {