Update `tootctl maintenance fix-duplicates` to Mastodon v4.2.0 (#27147)
Fix division by zero in video in bitrate computation code (#27129)
Merge pull request #2422 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Bump version to v4.2.0 (#27017)
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
Add migration tests for negative settings (#27012)
Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Fix incorrect PostgreSQL version check (#26979)
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Bump version to v4.2.0-rc2 (#26974)
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream
Conflicts:
- `streaming/index.js`:
Upstream has added a parameter to `streamFrom`, while glitch-soc had an
extra parameter.
Ported upstream changes.
Change video bitrate to always fit within size limit (#26970)