はてさて 
f7182ddc8b (upstream/main) Change libvips to be enabled by default (#34741)
4709121f72 Remove Legacy OTP Secret code (#34743)
dab31f7a88 Drop support for PostgreSQL 12 (#34744)
855022f4d9 Use `ActiveSupport::TaggedLogging.logger` shorthand to set logger (#34734)
a8f12a6fd8 Change Node.js minimum version to Node 20 (#34390)
ef87cd6910 Fix incorrect `progress` value being passed to react-spring in video player (#34740)
042a9c42be fix(deps): update dependency @reduxjs/toolkit to v2.8.2 (#34477)
6d6263ce07 Drop redis namespace code (except for Rails cache) (#34665)
f94b1fce41 Drop compatibility with Redis < 6.2 (#30413)
d7cb6068b1 Add ability to reorder server rules from admin interface (#34737)
8ed0408adb New Crowdin Translations (automated) (#34736)
0ada6e4168 Bypass date of birth check in `dev:populate_sample_data` task (#34733)
CONFLICT (content): Merge conflict in package.json
お
"engines": {
<<<<<<< HEAD
"node": ">=18 <21"
=======
"node": ">=20"
>>>>>>> master
},
ふむ
$ git checkout --theirs package.json
で行けるかしら
ｷｪ
$ bundle exec rspec
An error occurred while loading ./spec/controllers/api/proofs_controller_spec.rb. - Did you mean?
rspec ./spec/controllers/api/base_controller_spec.rb
rspec ./spec/controllers/admin/base_controller_spec.rb
rspec ./spec/controllers/application_controller_spec.rb
なにもしてないのになおった←
$ bundle exec rspec
Run options: exclude {streaming: true, search: true, js: true}
Randomized with seed 33283
......
\Master?/ \ますたー/
Merged mastodon/mastodon at f7182ddc8b44f71f6991941b9356454e4468bcd7.