Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
Fix firehose not indicating new toots in "All" (#2335)
When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Fix "All" live feed not loading automatically. (#2332)
The dispatch to expand the timeline was missing the `allowLocalOnly` param.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Change error boundary to upstream's (#2323)
Fix relationship-tag background color (#2322)
Fix glitch local settings navigation items not being proper buttons (#2320)
Annotate doodle parameters to please eslint (#2321)
Fix “Open in advanced web interface” being shown on mobile view (#2318)
Fixes #2307
Add stricter protocol fields validation for accounts (#25937)
Fix `Lint/Void` cop (#25922)
Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039)
Move localized subject mailer shared example to separate file (#25889)