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

Roll back MXID and room pillification #10370

Merged
merged 1 commit into from
Mar 14, 2023

Conversation

weeman1337
Copy link
Contributor

@weeman1337 weeman1337 commented Mar 14, 2023

closes element-hq/element-web#24817

Reverts c7acade

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.

@weeman1337 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 weeman1337 changed the title Roll back pillify everything Roll back MXID and room pillification Mar 14, 2023
@weeman1337 weeman1337 requested a review from andybalaam March 14, 2023 10:34
@andybalaam
Copy link
Member

Reverts the important parts of #10267

@weeman1337
Copy link
Contributor Author

Reverts the important parts of #10267

Yes, I've just added a link to the commit to the description.

@weeman1337 weeman1337 marked this pull request as ready for review March 14, 2023 10:54
@weeman1337 weeman1337 requested a review from a team as a code owner March 14, 2023 10:54
@weeman1337 weeman1337 requested a review from t3chguy March 14, 2023 10:54
@weeman1337 weeman1337 merged commit 05e3fb0 into develop Mar 14, 2023
@weeman1337 weeman1337 deleted the weeman1337/roll-back-pillify-everything branch March 14, 2023 10:56
@RiotRobot
Copy link
Contributor

The backport to staging failed:

The process '/usr/bin/git' failed with exit code 1

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 base branch is staging and the compare/head branch is backport-10370-to-staging.

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

anything that looks like an mxid is now unexpectedly pillified, complete with broken avatar
3 participants