今日もどばー 
668a19a2f3 (upstream/main) Fix Performance/DeletePrefix cop (#24796)
05e3abe9d9 Fix Lint/EmptyClass cop (#24795)
8d61d2b0da Bump axios from 1.3.6 to 1.4.0 (#24775)
8f7c172eb8 Bump @babel/preset-typescript from 7.21.4 to 7.21.5 (#24776)
b0ebaeb691 Bump @babel/preset-env from 7.21.4 to 7.21.5 (#24773)
1d49718a84 Bump @babel/runtime from 7.21.0 to 7.21.5 (#24771)
14a7e414fc Bump @babel/core from 7.21.4 to 7.21.5 (#24778)
8227af8dcc use configureStore of redux-toolkit instead of createStore of redux (#24790)
2839fbc733 Bump eslint-plugin-formatjs from 4.10.0 to 4.10.1 (#24770)
4acf5f8971 Bump @typescript-eslint/eslint-plugin from 5.59.1 to 5.59.2 (#24768)
4b87e2a8db Bump @typescript-eslint/parser from 5.59.1 to 5.59.2 (#24774)
b75c353962 Bump yargs from 17.7.1 to 17.7.2 (#24769)
18f58f4284 Bump jsdom from 21.1.1 to 21.1.2 (#24767)
24491abf6d Fix Rails/DeprecatedActiveModelErrorsMethods cop (#24742)
b5c4b47746 Fix Rails/ActiveRecordCallbacksOrder cop (#24689)
続きます
38b2974a83 Extract AccountSearch concern from Account (#24716)
f1c1dd0118 Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)
a7df578f97 ApplicationHelper spec coverage, unused removal, tiny refactor (#24762)
c26b1b0a1c Bump pg from 1.5.2 to 1.5.3 (#24772)
389f0443c8 Bump cssnano from 6.0.0 to 6.0.1 (#24777)
570079f8ce Fix Performance/TimesMap cop (#24789)
bae694108a Fix Performance/Count cop (#24793)
9189e90ff2 Add fallback redirection when getting a webfinger query `LOCAL_DOMAIN@LOCAL_DOMAIN` (#23600)
5e060e1f44 Fix Performance/Sum cop (#24788)
41eb49b984 Extract large route namespace blocks to separate files (#23914)
a89b02af92 Check domain suspensions before trying to fetch resources (#24535)
1ed0ff30d3 Fix `tootctl accounts cull` crashing when encountering a domain resolving to a private address (#23378)
b233da5996 Optimize archive export service and export zip files instead of gzipped tar files (#23360)
もいっちょ
8131a5b330 Add ALT badges to media that has alternative text in web UI (#24782)
6693a4fe7c Change lists to be able to include accounts with pending follow requests (#19727)
598e63dad2 Change media elements to use aspect-ratio rather than compute height themselves (#24686)
1eb51bd749 Add request specs for caching behavior (#24592)
88d33f361f Fix Lint/DuplicateBranch cop (#24766)
f50105779b Add type annotation for Blurhash component (#24750)
5a5975d7f7 Add type annotation for IconButton component (#24753)
32a030dd74 Rewrite import feature (#21054)
0ad2413b35 Fix n+1 query in settings migration (#24783)
おや
CONFLICT (content): Merge conflict in config/routes.rb
…ってKeyBase関係わね
git commitがBundler::GemNotFoundで落ちるかなしみ
$ bundle install
$ yarn install --pure-lockfile
$ git commit
:
マイグレーションファイルでrubocopに怒られまくる。どうしてこうなった…
$ git config --list | grep hook
core.hookspath=.husky
$ find .husky -type f
.husky/_/.gitignore
.husky/_/husky.sh
.husky/pre-commit
$ find .husky -type f | xargs ls -l
-rw-rw-r-- 1 zunda zunda 1 May 2 09:36 .husky/_/.gitignore
-rw-r--r-- 1 zunda zunda 717 May 2 09:36 .husky/_/husky.sh
-rwxrwxr-x 1 zunda zunda 59 Mar 28 08:12 .husky/pre-commit
ふむ
$ chmod -x .husky/pre-commit
$ git commit .husky/pre-commit -m 'Stop pre-commit hook'
hint: The '.husky/pre-commit' hook was ignored because it's not set as executable.
hint: You can disable this warning with `git config advice.ignoredHook false`.
[use-ruby32 0f1dbc8c52] Stop pre-commit hook
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 .husky/pre-commit
\Master?/ \ますたー/
Merged mastodon/mastodon at 668a19a2f325c4e9fe2fd97d391ad3d2cd18c42a.