Merge remote-tracking branch 'upstream' into glitch
Fix scroll position in thread view reseting when closing a modal (#27350)
Fix clicking on already-loaded thread scrolling to the top of the thread (#27338)
Change `eslint` config to autofix missing comma and indentation in JS files (#26711)
Fix clicking on already-opened thread post scrolling to the top of the thread (#27331)
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.
Fix hashtag bar being sometimes incorrectly hidden (#26960)
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
Fix some React warnings (#26609)
Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615)