Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
Add toast with option to open post after publishing in web UI (#25564)
Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Add missing report category translation (#25400)
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
Rewrite actions/modal and reducers/modal with typescript (#24833)
Rewrite `<LoadGap />` as FC and TS (#25042)
Enforce import order with ESLint (#25096)
Use JSX syntax for Fragments (#25093)
Use the new JSX transform (#25064)
Merge pull request #2216 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Enable ESLint react/no-deprecated (#24471)