Skip to content

Conversation

@germain-gg
Copy link
Contributor

@germain-gg germain-gg commented Oct 31, 2022

Fixes element-hq/element-web#23634

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)

Here's what your changelog entry will look like:

🐛 Bug Fixes

@t3chguy t3chguy added X-Release-Blocker backport staging Label to automatically backport PR to staging branch labels Oct 31, 2022
@germain-gg germain-gg merged commit 1f3ae4b into develop Oct 31, 2022
@germain-gg germain-gg deleted the gsouquet/versions-failsafe-23634 branch October 31, 2022 17:44
@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-2828-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1f3ae4bde2955f31361f733b20375221383963b0
# Push it to GitHub
git push --set-upstream origin backport-2828-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-2828-to-staging.

t3chguy pushed a commit that referenced this pull request Nov 1, 2022
su-ex added a commit to SchildiChat/element-desktop that referenced this pull request Nov 4, 2022
* Fix default behavior of Room.getBlacklistUnverifiedDevices ([\#2830](matrix-org/matrix-js-sdk#2830)). Contributed by @duxovni.
* Catch server versions API call exception when starting the client ([\#2828](matrix-org/matrix-js-sdk#2828)). Fixes element-hq/element-web#23634.
* Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\#2822](matrix-org/matrix-js-sdk#2822)). Fixes element-hq/element-web#23655.
su-ex added a commit to SchildiChat/element-web that referenced this pull request Nov 4, 2022
* Fix default behavior of Room.getBlacklistUnverifiedDevices ([\element-hq#2830](matrix-org/matrix-js-sdk#2830)). Contributed by @duxovni.
* Catch server versions API call exception when starting the client ([\element-hq#2828](matrix-org/matrix-js-sdk#2828)). Fixes element-hq#23634.
* Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\element-hq#2822](matrix-org/matrix-js-sdk#2822)). Fixes element-hq#23655.
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Nov 4, 2022
* Fix default behavior of Room.getBlacklistUnverifiedDevices ([\matrix-org#2830](matrix-org#2830)). Contributed by @duxovni.
* Catch server versions API call exception when starting the client ([\matrix-org#2828](matrix-org#2828)). Fixes element-hq/element-web#23634.
* Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\matrix-org#2822](matrix-org#2822)). Fixes element-hq/element-web#23655.
su-ex added a commit to SchildiChat/matrix-react-sdk that referenced this pull request Nov 4, 2022
* Fix default behavior of Room.getBlacklistUnverifiedDevices ([\matrix-org#2830](matrix-org/matrix-js-sdk#2830)). Contributed by @duxovni.
* Catch server versions API call exception when starting the client ([\matrix-org#2828](matrix-org/matrix-js-sdk#2828)). Fixes element-hq/element-web#23634.
* Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\matrix-org#2822](matrix-org/matrix-js-sdk#2822)). Fixes element-hq/element-web#23655.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport staging Label to automatically backport PR to staging branch T-Defect X-Release-Blocker

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Can't restore previous session

5 participants