Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Prep for matrix-js-sdk supporting intentional mentions #10431

Merged
merged 1 commit into from
Mar 22, 2023

Conversation

clokep
Copy link
Member

@clokep clokep commented Mar 22, 2023

matrix-org/matrix-js-sdk#3092 currently fails the upstream checks during merge because the matrix-react-sdk has within it an embedded fake MatrixClient object. Some matrix-react-sdk tests fail (on develop) if you merge that PR since the fake client would no longer be compatible with the real MatrixClient.

This gets around this issue by ripping part of #9983 into a separate PR which can be merged first, we can then merge matrix-org/matrix-js-sdk#3092; then we can merge #9983.

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

This change is marked as an internal change (Task), so will not be included in the changelog.

@clokep clokep added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Mar 22, 2023
@clokep clokep marked this pull request as ready for review March 22, 2023 19:59
@clokep clokep requested a review from a team as a code owner March 22, 2023 19:59
@clokep clokep merged commit 5c47142 into matrix-org:develop Mar 22, 2023
@clokep clokep deleted the intentional-mentions-prep branch March 22, 2023 20:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
T-Task Refactoring, enabling or disabling functionality, other engineering tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants