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

Merge upstream changes

[Glitch] Fix “Back” button sometimes redirecting out of Mastodon

Port a442a1d1c69e5d477ca1c05f0bc5fc0f6894b223 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.

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

Merge upstream changes

Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947)

Fix “Back” button sometimes redirecting out of Mastodon (#25281)

Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948)

Migrate to request specs in `/api/v1/statuses/:status_id/favourite` (#25626)

Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` (#25624)

Migrate to request specs in `/api/v1/polls` (#25596)

Migrate to request specs in `/api/v1/statuses/:status_id/pin` (#25635)

Migrate to request specs in `/api/v1/emails/confirmations` (#25686)

Migrate to request specs in `/api/v1/timelines/home` (#25743)

Increase PR Rebase job retries (#25926)

Check if json body is null on Activitipub::ProcessingWorker (#26021)

Fix haml-lint Rubocop `Style/MinMaxComparison` cop (#25974)

Fix haml-lint Rubocop `lambda` cop (#25946)

Fix haml lint Rubocop `Style/RedundantStringCoercion` cop (#25975)

Update dependency react-select to v5.7.4 (#26033)

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

Remove unfollowed hashtag posts from home feed (#26028)