Revert code moving deleted messages to main timeline #3858
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…acted" This reverts commit 378a776. Context: element-hq/element-web#26498
This reverts commit 17b61a6. Context: element-hq/element-web#26498
This reverts commit d8fc179. Context: element-hq/element-web#26498
This reverts commit 942dfcb. Context: element-hq/element-web#26498
This reverts commit 43a0dc5. Context: element-hq/element-web#26498
This reverts commit 9b0ea80. Context: element-hq/element-web#26498
This reverts commit b94d137. Context: element-hq/element-web#26498
t3chguy
added
X-Release-Blocker
backport staging
RiotRobot
pushed a commit
that referenced
this pull request
Nov 7, 2023
* Revert "Move the redaction event to main at the same time we move redacted" This reverts commit 378a776. Context: element-hq/element-web#26498 * Revert "Don't remove thread info from a thread root when it is redacted" This reverts commit 17b61a6. Context: element-hq/element-web#26498 * Revert "Move all related messages into main timeline on redaction" This reverts commit d8fc179. Context: element-hq/element-web#26498 * Revert "Factor out the code for moving an event to the main timeline" This reverts commit 942dfcb. Context: element-hq/element-web#26498 * Revert "Factor out utils in redaction tests" This reverts commit 43a0dc5. Context: element-hq/element-web#26498 * Revert "Move redaction event tests into their own describe block" This reverts commit 9b0ea80. Context: element-hq/element-web#26498 * Revert "Move redacted messages out of any thread, into main timeline." This reverts commit b94d137. Context: element-hq/element-web#26498 (cherry picked from commit 7813e12)
This was referenced Nov 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts the important commits from:
Fixes element-hq/element-web#26498
This change is marked as an internal change (Task), so will not be included in the changelog.