Merge upstream changes up to 9a3d047f3e604e581e18346424569e28fc9c5b96

[ClearlyClaire]

This one will take a while due to the extensive changes required for upgrading react-router.

Merge upstream changes up to 1b70d7e

Conflicts

None

Ported changes

• 1b70d7e

Merge upstream changes up to 0ad6617

Conflicts

• app/javascript/mastodon/features/compose/components/compose_form.jsx:
  Upstream changed one import, close to a glitch-soc-only import to handle different max character counts.
  Ported upstream's change.

Ported changes

• 33bd8ec
• 9d45a44
• 0ad6617

Merge upstream changes up to bcae744

Conflicts

• yarn.lock:
  Caused by a glitch-soc-only dependency (exif-js).
  Kept it.

Ported changes

None

Merge upstream changes up to 8b770ce

Conflicts

• config/initializers/content_security_policy.rb:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.

Merge upstream changes up to fc7734d

N/A

Merge upstream changes up to d9503a1

Conflicts

None

Ported changes

• d9503a1

Merge upstream changes up to 379115e

Conflicts

• config/navigation.rb:
  Conflict due to glitch-soc having extra navigation items for its theming system.
  Ported upstream changes.

Ported changes

None

Merge upstream changes up to e93a75f

Conflicts and ported changes

• updated @rails/ujs imports

Additional changes

• 8a131fb fix @rails/ujs usage
• 3c9c029 fix ActiveRecord::Migrator monkey-patch

Merge upstream changes up to 15182d1

Conflicts

• .rubocop_todo.yml:
  glitch-soc had extra ignores.
  Removed them.

Ported changes

• 9482810
• 15182d1

Additional ported changes

• 8123e86 somehow missed in an earlier merge

Additional changes

• b19d4eb fix HAML linting issues

Merge upstream changes up to 134de73

Conflicts

• app/javascript/mastodon/features/compose/components/poll_form.jsx:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.

Postponed changes

• 134de73 (see Port upstream's icon changes #2453)

Merge upstream changes up to c85e0a6

Conflicts

• app/javascript/packs/admin.jsx:
  Upstream fixed @rails/ujs imports.
  Already taken care of in 8a131fb
• app/javascript/packs/public.jsx:
  Upstream fixed @rails/ujs imports.
  Already taken care of in 8a131fb

Ported changes

• cb92cdf

Postponed changes

• f08ca3f (see Port upstream's icon changes #2453)

Merge upstream changes up to 9a3d047

Postponed changes

• a4e6fe3 (see Port upstream's icon changes #2453)

Additional changes

• 36c8570 (fix linting issue)

[ClearlyClaire]

It appears to work, but I'm hitting a Typescript issue I don't understand (tbh the withOptionalRouter implementation feels a bit like magic)

[Plastikmensch]

I don't really find a "pretty" fix for that, but either using an expect error comment in hashtag.jsx or using withRouter instead of withOptionalRouter in permalink.jsx works and gets rid of the typeerror.

Update: nvm, both withRouter and withOptionalRouter is breaking the history.
While in simple UI, going to an account page with featured tags, clicking one and then clicking a random other element and the back button navigates back to /home instead of /@user/tagged/Hashtag
This also happens with other routes, but doesn't seem to happen in the advanced interface.

[ClearlyClaire]

There are issues in e.g. the list of pending follow requests. Those will be fixed upstream but unfortunately there is an enormous disruptive commit in the way, so I'll probably cherry-pick the fixes.

[ClearlyClaire]

I believe all the identified regressions have been addressed. The big changes I was talking about were also merged, but not ported yet, there was no immediate need to do so after all. They will need to be ported soon, though.