Fix import order inconsistencies (#2289)
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Add canonical link tags in web UI (#25715)
Fix local live feeds does not expand (#25694)
Change labels of live feeds tabs in web UI (#25683)
Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
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)
Change local and federated timelines to be in a single firehose column (#25641)
Fix onboarding prompt being displayed because of disconnection gaps (#25617)
Remove the search button from UI header when logged out (#25631)
Merge pull request #2258 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Fix onboarding prompt flashing while home feed is loading in web UI (#25579)
Fix search not being easily findable on smaller screens in web UI (#25576)
Merge pull request #2256 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.