AIの話なんかしてないで更新しようぜ 
6374358357 (upstream/main) Change media to be hidden/blurred by default in report modal (#28522)
fcfdeadc04 Fix random `NoMethodError` errors on cached `CustomFilter` objects (#28521)
3599622b5b Fix destructive actions in dropdowns not using error color in light theme (#28484)
ba5f659bb3 Use shorter attribute query methods in `Announcement` (#28474)
fd57e40681 Update dependency rubocop-performance to v1.20.1 (#28492)
7df9c4f6f3 New Crowdin Translations (automated) (#28481)
5fd16c3ffd Update dependency nokogiri to v1.16.0 (#28513)
54ed01538e Update dependency core-js to v3.35.0 (#28518)
128c5b7db3 Fix `Performance/StringIdentifierArgument` cop (#28508)
63901bb34b Update github/codeql-action action to v3 (#28495)
f7f7236fa2 Update dependency ws to v8.16.0 (#28504)
87bf85ffdd Update dependency classnames to v2.5.0 (#28498)
b01a027543 Update dependency tzinfo-data to v1.2023.4 (#28478)
f6f85b9521 Update dependency aws-sdk-s3 to v1.142.0 (#28479)
(続く)
3fbfc50f17 Update dependency brakeman to v6.1.1 (#28487)
de3fa293b0 Update dependency fastimage to v2.3.0 (#28488)
07ab97d7f9 Update dependency rubocop-rails to v2.23.1 (#28493)
87e9e87a14 Update eslint (non-major) (#28494)
01df9f1abb install "wget" in streaming Dockerfile (#28497)
3f0140bbdf Update dependency webauthn to v3.1.0 (#28507)
851a9b80c8 Update dependency react-redux-loading-bar to v5.0.7 (#28511)
fb58397a33 Update dependency axios to v1.6.3 (#28509)
f923eeb9b8 Update dependency sass to v1.69.6 (#28517)
1cba91d6d1 Fix reply icon display in picture-in-picture footer (#28519)
fb5eb1f655 Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510)
$ git merge --no-edit master
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging package.json
Recorded preimage for 'Gemfile.lock'
Automatic merge failed; fix conflicts and then commit the result.
AIでなんとかして #ではない
\Master?/ \ますたー/
Merged mastodon/mastodon at 6374358357ee81b5f137f471f028a56974109155.