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

2024-05-31 08:27:09 +09:00 · 2024-05-31 08:27:09 +09:00 · 13ad383039
commit 13ad383039
parent f3f9e5d545 7f808ff6e9
101 changed files with 1486 additions and 1232 deletions
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@ -45,7 +45,7 @@ describe 'Instances' do
          ),
          statuses: include(
            max_characters: StatusLengthValidator::MAX_CHARS,
-            max_media_attachments: 4 # TODO, move to constant somewhere
+            max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT
          ),
          polls: include(
            max_options: PollValidator::MAX_OPTIONS