Reduce factory data created in spec/models/trends/statuses spec (#25410)
Speed improvement for `AccountsStatusesCleanupScheduler` spec (#25406)
Migrate to request specs in `/api/v1/apps/verify_credentials` (#25404)
Migrate to request specs in `/api/v1/apps` (#25401)
Extract shared examples from api specs (#25387)
Update babel monorepo to v7.22.5 (#25405)
Update dependency capybara to v3.39.2 (#25407)
Update dependency aws-sdk-s3 to v1.124.0 (#25297)
Fix always redirecting to onboarding in web UI (#25396)
Fix ArgumentError when loading newer Private Mentions (#25399)
Change edit profile page (#25413)
Fix CAPTCHA page not following design pattern of sign-up flow (#25395)
Rewrite `emoji_mart_data_light` as TS (#25138)
Rewrite `<LoadingIndicator/>` as FC and TS (#25364)
Update Rubocop 1.52.1 (#25376)
Add missing report category translation (#25400)
Remove unused shared examples for scoped settings (#25389)
Enable paperclip for account attachment examples (#25381)
Add unsubscribe link to e-mails (#25378)
CONFLICT (content): Merge conflict in app/views/settings/profiles/show.html.haml
CONFLICT (content): Merge conflict in config/locales/simple_form.en.yml
CONFLICT (content): Merge conflict in config/locales/simple_form.ja.yml
CONFLICT (content): Merge conflict in config/navigation.rb
ぷーえー
コンフリクトの解消中にもうひとcommit
f10f4f235 (upstream/main) Update dependency glob to v10.2.7 (#25417)
\Master?/ \ますたー/
Merged mastodon/mastodon at f10f4f2359c6041349f36393c550db5088b3dc16.