そういえば。またコンフリクトしそう…
49b8433c56 (upstream/main) Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368)
9a3d047f3e Run `bin/rails app:update` with Rails 7.1 (#27522)
235a4cfdc8 Fix batch attachment deletion when using OpenStack Swift (#27554)
a4e6fe36cb Add missing ban icons (#27555)
70dbf84b9b Solve simplest haml-lint `Rubocop` lints (#27529)
fa65c8244f Fix cache store pool config deprecation warnings (#27551)
c926f5fd67 Fix haml-lint `UnnecessaryStringOutput` for views (#27531)
c85e0a6b04 New Crowdin Translations (automated) (#27544)
f261b6499f Update dependency node to 20.9 (#27534)
cec7f0ed72 Remove unused `#error_explanation` id from error partials (#27536)
cb92cdf9af Fix `<ColumnBackButtonSlim>` (#27540)
f08ca3f042 Fix missing icon props (#27539)
bc3afb6311 Update `rails/ujs` delegate method usage (#27538)
134de736dc Change icons in web UI (#27385)
b1885387b6 Fix missing libyaml-dev dependency in Dockerfile (#27533)
(続く)
15182d1e5e Fix history handling not properly handling states after update to react-router v5 (#27526)
6cf9f1211b Create custom Github Actions for common steps (#27518)
714e3ae5b5 Use Rails 7.1 `normalizes` feature (#27521)
50b7ea810e New Crowdin Translations (automated) (#27523)
e923bb9ec9 Use `ENV.fetch` in views, fixes rubocop haml-lint issue (#27527)
4fdc548fa5 Regenerate lint todos (#27513)
9482810703 Rewrite `emoji_unicode_mapping_light` to TS (#25444)
gkbr
CONFLICT (content): Merge conflict in .haml-lint_todo.yml
CONFLICT (content): Merge conflict in app/javascript/mastodon/components/column_back_button.jsx
CONFLICT (content): Merge conflict in app/javascript/mastodon/components/column_header.jsx
CONFLICT (content): Merge conflict in app/javascript/mastodon/features/status/components/detailed_status.jsx
CONFLICT (content): Merge conflict in config/locales/ko.yml
CONFLICT (content): Merge conflict in config/locales/sv.yml
CONFLICT (content): Merge conflict in config/locales/zh-CN.yml
翻訳まで…cherry-pickするかねえ…
$ git merge --abort
ｼｺﾞﾄｼﾖ
古い方からcherry-pickしてみたら6cf9f1211bまではemptyだったな…
15182d1e5eはコンフリクトしなかったけど混ぜちゃだめなやつだ…
> Fix history handling not properly handling states after update to react-router v5 (#27526)
$ git revert 15182d1e5e
ここまででいちどでぷろい 
15182d1e5e Fix history handling not properly handling states after update to react-router v5 (#27526)までcherry-pickしてrevertしたものをデプロイしました
めんどくさいよう
DEPRECATION WARNING: Using :pool_size is deprecated and will be removed in Rails 7.2.
Use `pool: { size: 3 }` instead.
(called from <main> at /app/config/environment.rb:7)
DEPRECATION WARNING: Using :pool_timeout is deprecated and will be removed in Rails 7.2.
Use `pool: { timeout: 5 }` instead.
(called from <main> at /app/config/environment.rb:7)
DEPRECATION WARNING: Support for `config.active_support.cache_format_version = 6.1` has been deprecated and will be removed in Rails 7.2.
ここまででrevertしてるのは #25047 #27489 #27507 #27526 #27385 #27526