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

2024-04-01 08:52:35 +09:00 · 2024-04-01 08:52:35 +09:00 · bef755a577
commit bef755a577
parent 4a9f549dd2 90eb4a5d01
111 changed files with 989 additions and 720 deletions
--- a/app/serializers/rest/marker_serializer.rb
+++ b/app/serializers/rest/marker_serializer.rb
@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class REST::MarkerSerializer < ActiveModel::Serializer
+  # Please update `app/javascript/mastodon/api_types/markers.ts` when making changes to the attributes
+
  attributes :last_read_id, :version, :updated_at

  def last_read_id