あさからミーティングぐえー 
Change design of confirmation modals in web UI (#30884)
fix(deps): update dependency pino to v9.3.2 (#31148)
Allow @ at the end of an URL (#31124)
Remove duplicate `omniauth_only?` helper method (#31066)
Fix LinkCrawlWorker NoMethodError: undefined method `[]' for nil (#31144)
Improve failure message on pagination matcher (#31146)
Fix ß bug in regexp for mentions and tags (#31122)
Add `User.unconfirmed` scope, reduce factories in `scheduler/user_cleanup` spec (#31063)
Update schema to reflect full `db:migrate` run results (#31128)
chore(deps): update dependency opentelemetry-exporter-otlp to v0.28.1 (#31139)
chore(deps): update dependency node to 20.16 (#31127)
New Crowdin Translations (automated) (#31119)
chore(deps): update opentelemetry-ruby (non-major) (#31138)
fix(deps): update dependency postcss to v8.4.40 (#31137)
chore(deps): update opentelemetry-ruby (non-major) (#31126)
と思ってたら消えてたw
CONFLICT (content): Merge conflict in app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
commit hookで
Could not find opentelemetry-api-1.3.0, opentelemetry-exporter-otlp-0.28.1, …
ってbundle installしないとcommitもできないんか。
chmod +x .husky/pre-commit
は無かったことにするね。
フックまだ走るな…
$ chmod -x .husky/_/*
こっちかしら。
.git/configを編集しちゃった…。
Yarn release script may conflict with "packageManager"
The package.json file indicates the target version of Yarn to install with:
- "packageManager": "yarn@4.3.1"
But the .yarnrc.yml configuration indicates a vendored release of Yarn should be used with:
- yarnPath: ".yarn/releases/yarn-4.2.2.cjs"
yarnもめんどくさいやーん!!
まったまたー
➤ YN0000: · Yarn 4.3.1
➤ YN0000: ┌ Resolution step
➤ YN0085: │ + typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07
➤ YN0085: │ - typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=b45daf
➤ YN0000: └ Completed in 0s 304ms
$ yarn install
$ git commit yarn.lock -m 'Run yarn install'
ずっと2種類ある気のする…
\Master?/ \ますたー/
Merged mastodon/mastodon at 8818748b9023acd84f42bf887e361d9244521df4.
確認ダイアログがブラウザの底に沈んだのは電話向けなんだろうけどデスクトップだとマウスが遠くなるなあ…
@zundan ダジャレを検出しました（検出ワード: CONFLICT）