二度寝してる間にどっさり 
e93a75f1a1 (upstream/main) Rails 7.1 update (#25963)
379115e601 Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)
26d2a2a0cc Migrate to request specs in `/api/v1/media` (#25543)
d9503a1965 Fix explore page reloading when you navigate back to it in web UI (#27489)
79a63201a9 Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR (#27512)
fc7734df8d Remove Renovate's Lock File Maintenance task (#27510)
3cfdab6b48 Prune the changelog of older entries (#27432)
d5408dbb54 Update dependency prom-client to v15 (#27330)
8b770ce811 Add warnings to report action logs (#27425)
44edf3aa91 Improve error handling in mastodon:setup task (#21464)
99f2534cee Add support for displaying unknown servers on /admin/instances/:domain (#27150)
c3e0eb3699 Change Content-Security-Policy to be tighter on media paths (#26889)
bcae744275 Fix some link anchors being recognized as hashtags (#27271)
53fd28b889 Update dependency react-select to v5.7.7 (#27003)
(続く)
f7b34707a8 Update babel monorepo to v7.23.2 (#27118)
25751c653e Update DefinitelyTyped types (non-major) (#27414)
132204031f Update dependency core-js to v3.33.1 (#27481)
bb5bae186f Update dependency webpack-merge to v5.10.0 (#27420)
69d3318055 Update dependency rimraf to v5.0.5 (#27140)
cd08b436ab Update dependency sass to v1.69.4 (#27004)
6f1eb89d21 Update dependency ws to v8.14.2 (#26980)
6f429d3f1b Update formatjs monorepo (#27416)
773133befa Update eslint (non-major) (#27415)
0ad66175bf Fix incorrect proptypes from react-router-v5 update (#27507)
70fd819935 New Crowdin Translations (automated) (#27490)
b0213472df Validate allowed schemes on preview card URLs (#27485)
9d45a444f9 Convert `<Button>` to Typescript (#27492)
待って。#27507で#25047の問題がなおるとか可能性ある？とりあえず#25047を当てなおしてmergeしてみる？
とりあえず
$ git cherry-pick 1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f
してmainからmergeしますね
remote: -----> Using Ruby version: ruby-3.2.2
remote: Ruby version change detected. Clearing bundler cache.
remote: Old: ruby 3.3.0preview2 (2023-09-14 master e50fcca9a7) [x86_64-linux]
remote: New: ruby 3.2.2 (2023-03-30 revision e51014f9c0) [x86_64-linux]
あれれ？…ってGemfile.lockのおしりね。
だめでしたー。
$ git revert 0ad66175bf
$ git revert 1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f
:
CONFLICT (content): Merge conflict in yarn.lock
ぐえー
$ cp -p yarn.lock yarn.lock.conflict
$ yarn install
$ git add yarn.lock
$ git revert --continue
gkbr
assets:precompileが通らない。
$ git revert d9503a1965a16328b62ea7bf0bb54e87cbe30d29
で#27489も消してみます。
\Master?/ \ますたー/
Merged mastodon/mastodon at e93a75f1a11d6dfdcbd39dbdc22526c5508ad881 with PRs #25047 #27489 #27507 reverted.