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

2024-01-18 09:17:39 +09:00 · 2024-01-18 09:17:39 +09:00 · 2b51fabe9c
commit 2b51fabe9c
parent f20ebfac41 127503eb2c
397 changed files with 2899 additions and 3252 deletions
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@ -29,7 +29,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
      }
    else
      {
-        url: full_pack_url('media/images/preview.png'),
+        url: frontend_asset_url('images/preview.png'),
      }
    end
  end