Merge branch 'main' into glitch-soc/merge-upstream
Revert "Rails 7 update" (#25667)
Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663)
Change dropdown icon above compose form from ellipsis to bars in web UI (#25661)
Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595)
Change local and federated timelines to be in a single firehose column (#25641)
Update uri to version 0.12.2 (CVE fix) (#25657)
Fixing an issue with a missing argument (#2261)
undefined
Remove unused routes (#25578)
Fix rails `rewhere` deprecation warning in directories api controller (#25625)
Add index to backups on `user_id` column (#25647)
Use an Immutable Record as the root state (#25584)
Fix onboarding prompt being displayed because of disconnection gaps (#25617)
Update Crowdin configuration file
Remove `pkg-config` gem dependency (#25615)
Fix ResolveURLService not resolving local URLs for remote content (#25637)
Change account search to match by text when opted-in (#25599)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Remove the search button from UI header when logged out (#25631)
Merge pull request #2258 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes