よっこい 
db97197685 (upstream/main) Remove `rails-controller-testing` gem (#33955)
68e5f0c452 fix(deps): update dependency ws to v8.18.1 (#33970)
2a15bf4ede Convert `admin/roles` controller spec to request/sytem specs (#33947)
93bc48d649 Use bundler version 2.6.5 (#33965)
26c692d45b Fix streaming server not filtering unknown-language posts from public timelines (#33774)
2788808b07 New Crowdin Translations (automated) (#33967)
8d3bd919d8 chore(deps): update dependency selenium-webdriver to v4.29.0 (#33969)
d065d02d88 Improve example wording in 2FA/confirmations controller spec (#33944)
fc83fdc993 fix(deps): update dependency postcss to v8.5.3 (#33962)
12d0533bd7 Change "Specific people" to "Private mention" in menu in web UI (#33963)
52c6f6dffc fix(deps): update dependency uuid to v11.1.0 (#33964)
\Master?/ \ますたー/
Merged mastodon/mastodon at db971976853103017b1561f2c4f9406fa00c0a2e.
ふええ
$ bundle exec rspec
:
1) Settings::IdentityProofsController new proof creation GET #new with all of the correct params renders the template
Failure/Error: expect(response).to render_template(:new)
NoMethodError:
assert_template has been extracted to a gem. To continue using it,
add `gem "rails-controller-testing"` to your Gemfile.
# ./spec/controllers/settings/identity_proofs_controller_spec.rb:40:in 'block (5 levels) in <top (required)>'
# ./spec/rails_helper.rb:139:in 'block (2 levels) in <top (required)>'
2) Settings::IdentityProofsController new proof creation GET #new with params to prove the same username cased differently renders the new template
Failure/Error: expect(response).to render_template(:new)
:
#33955 の一部をrevertしてテストを通るようにしましま