きょうももりもり 
fa8e972722 (upstream/main) Fix author names as arrays in linked data. (#30957)
f1300ad284 Rename jobs/attachments rspec tag names (#29762)
79b0e192d9 Move test migrations paths check to workflow level (#30702)
36d819bef3 Change to use an unified constant for max media attachments per status (#29073)
1a37862a76 New Crowdin Translations (automated) (#30940)
d41b43ed4f Limit attachments to `MEDIA_ATTACHMENTS_LIMIT` when returning posts through the API (#30932)
fd3bfc0710 fix(deps): update dependency postcss-preset-env to v9.6.0 (#30944)
c29fdadefd Use `scope module: ...` for more API routes (#30935)
bd285cdd02 fix(deps): update dependency glob to v10.4.3 (#30941)
(続く)
bd84817848 chore(deps): update dependency irb to v1.14.0 (#30947)
5c3ec727ec chore(deps): update dependency typescript to v5.5.3 (#30953)
c5883e0999 chore(deps): update dependency @testing-library/dom to v10.3.1 (#30954)
981395e4d6 Remove the `title` attribute when hovering a card anchor (#30948)
0899c91d4b Add the account hover card for account search results (#30949)
1d35626dc7 Limit CI push triggers to `main` and `stable-*` branches (#30934)
63ba69810e Fix overflow behavior on profile fields in hover cards (#30928)
CONFLICT (content): Merge conflict in yarn.lock
ほえ。package.json変えてないハズだし
$ git checkout --theirs yarn.lock
Updated 1 path from the index
remote: ➤ YN0000: · Yarn 4.2.2
remote: ➤ YN0000: ┌ Resolution step
remote: ➤ YN0085: │ + typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=b45daf
remote: ➤ YN0085: │ - typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07
remote: ➤ YN0000: └ Completed in 0s 321ms
:
remote: ➤ YN0028: │ The lockfile would have been modified by this install, which is explicitly forbidden.
remote: ➤ YN0000: └ Completed
remote: ➤ YN0000: · Failed with errors in 0s 409ms
だめじゃんw
ローカルで
$ yarn install
:
➤ YN0000: · Yarn 4.2.2
➤ YN0000: ┌ Resolution step
➤ YN0085: │ + typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=b45daf
➤ YN0085: │ - typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07
➤ YN0000: └ Completed in 0s 406ms
:
$ git diff master yarn.lock
:
version: 5.5.3
- resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07"
+ resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=b45daf"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: 10c0/911c7811d61f57f07df79c4a35f56a0f426a65426a020e5fcd792f66559f399017205f5f10255329ab5a3d8c2d1f1d19530aeceffda70758a521fae1d469432e
+ checksum: 10c0/5a437c416251334deeaf29897157032311f3f126547cfdc4b133768b606cb0e62bcee733bb97cf74c42fe7268801aea1392d8e40988cdef112e9546eba4c03c5
languageName: node
:
なんもわからん
\Master?/ \ますたー…/
Merged mastodon/mastodon at fa8e972722fb8fc056aa348dddaee4005b4a8ac4.
@zundan ダジャレを検出しました（検出ワード: CONFLICT）