Merge remote-tracking branch 'upstream' into glitch
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/cors.rb`:
Upstream refactored this file, and glitch-soc had local changes.
I could not find the rationale for the glitch-soc changes, so I
used upstream's version.
Move migration_helpers Rubocop ignore to config (#24236)
Extract methods for file movement in `CLI::Upgrade` (#25120)
Bump version to v4.3.0-alpha.0 (#27022)
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