Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.

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.

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.

Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.

Update dependency redis to v4.6.8 (#26630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc

Update dependency sass to v1.66.1 (#26534)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency immutable to v4.3.3 (#26622)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency react-textarea-autosize to v8.5.3 (#26607)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream

Add `circular-dependency-plugin` to detect any circular deps issues (#26600)

Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714

Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream

Update eslint (non-major) (#26567)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency core-js to v3.32.1 (#26548)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @material-design-icons/svg to v0.14.11 (#26536)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency pg to v8.11.3 (#26519)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency postcss to v8.4.28 (#26502)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency autoprefixer to v10.4.15 (#26473)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Upgrade `@types/react` (#26457)