Merge pull request #686 from kmycode/upstream-20240401

Upstream 20240401
2024-04-01 09:21:13 +09:00 · 2024-04-01 09:21:13 +09:00 · 7b02596f1a
commit 7b02596f1a
parent 05e6d1bd9b bef755a577
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