This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 832
Roll back MXID and room pillification #10370
Merged
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
weeman1337
added
X-Release-Blocker
This affects the current release cycle and must be solved for a release to happen
T-Task
Refactoring, enabling or disabling functionality, other engineering tasks
backport staging
Label to automatically backport PR to staging branch
labels
Mar 14, 2023
weeman1337
changed the title
Roll back pillify everything
Roll back MXID and room pillification
Mar 14, 2023
Reverts the important parts of #10267 |
Yes, I've just added a link to the commit to the description. |
andybalaam
approved these changes
Mar 14, 2023
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-10370-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 05e3fb09d6e2a51b7cccbb02b371be71423bbfd7
# Push it to GitHub
git push --set-upstream origin backport-10370-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging Then, create a pull request where the |
andybalaam
pushed a commit
that referenced
this pull request
Mar 14, 2023
(cherry picked from commit 05e3fb0)
andybalaam
added a commit
that referenced
this pull request
Mar 14, 2023
Roll back pillify everything (#10370)
This was referenced Mar 14, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport staging
Label to automatically backport PR to staging branch
T-Task
Refactoring, enabling or disabling functionality, other engineering tasks
X-Release-Blocker
This affects the current release cycle and must be solved for a release to happen
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.
closes element-hq/element-web#24817
Reverts c7acade
Checklist
This change is marked as an internal change (Task), so will not be included in the changelog.