たいへんやっとおきました 
bb23116e8d (upstream/main) Fix profile picture preview (#26538)
ee702e36e5 Change follow recommendation materialized view to be faster in most cases (#26545)
e7bea8f004 Fix already initialized constant warning (#26542)
6375e390af Fix: support both DATABASE_URL and DB_PASS (#26295)
bb51c0676d Remove redundant ready() wrapper (#26533)
1cb978bcc3 Update dependency @material-design-icons/svg to v0.14.11 (#26536)
581ebf2bb5 Update dependency puma to v6.3.1 (#26537)
13ffe91c81 Fix `frame_rate` for videos where `ffprobe` reports 0/0 (#26500)
b95867ad1f Allow setting a custom HTTP method in CacheBuster (#26528)
\Master?/ \ますたー/
Merged mastodon/mastodon at bb23116e8d17b0fa7564a0f713c48753cfba7023.
== 20230818141056 CreateGlobalFollowRecommendations: migrating ================
[strong_migrations] DANGER: No lock timeout set
-- create_view(:global_follow_recommendations, {:materialized=>{:no_data=>true}})
-> 0.0275s
-- add_index(:global_follow_recommendations, :account_id, {:unique=>true})
-> 0.0054s
== 20230818141056 CreateGlobalFollowRecommendations: migrated (0.0351s) =======
== 20230818142253 DropFollowRecommendations: migrating ========================
[strong_migrations] DANGER: No lock timeout set
-- drop_view(:follow_recommendations, {:materialized=>true})
-> 0.0088s
== 20230818142253 DropFollowRecommendations: migrated (0.0104s) ===============