Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
Fix admin dashboard check when using Elasticsearch with `ES_PREFIX` (#26605)
Update rubocop and rubocop-rspec (#26329)
Add Elasticsearch cluster health check and indexes mismatch check to dashboard (#26448)
Add auto-refresh of accounts we get new messages/edits of (#26510)
Fix `frame_rate` for videos where `ffprobe` reports 0/0 (#26500)
Allow setting a custom HTTP method in CacheBuster (#26528)
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
Add alt text for preview card thumbnails (#26184)
Allow spaces around commas in ALLOWED_PRIVATE_ADDRESSES (#26297)
Fix request URL normalisation for bare domain and 8-bit characters (#26285)