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

2023-12-04 12:04:52 +09:00 · 2023-12-04 12:04:52 +09:00 · 94c2396a34
commit 94c2396a34
parent 780426db31 456597dae5
179 changed files with 1036 additions and 775 deletions
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@ -49,6 +49,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
        status: object.status_page_url,
      },

+      vapid: {
+        public_key: Rails.configuration.x.vapid_public_key,
+      },
+
      accounts: {
        max_featured_tags: FeaturedTag::LIMIT,
      },