Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Show local-only posts in “All” by default, and add back option to toggle it

[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI

Port 5b463454593e1aa3ab3d23446cdf57d606e933d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI

Port 0512537eb6722f1d52a690a6e1b22c8d0a99103b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

[Glitch] Change local and federated timelines to be in a single firehose column

Port cea9db5a0bfa0201b082e9f829fb4b3089ac0838 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

[Glitch] Use an Immutable Record as the root state

Port 78ba12f0bf97aee817eb0ab0d2c582b187033c50 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

[Glitch] Fix onboarding prompt being displayed because of disconnection gaps

Port 9934949fc4c0a019fc7c7d0e7bdd6e68d496a861 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

[Glitch] Remove the search button from UI header when logged out

Port 285a6919369e2bb1fc968e6e5b557bc62f9e53ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

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)

Rails 7 update (#24241)

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)