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

TAC: Close Release Announcement when TAC button is clicked #12475

Merged
merged 3 commits into from
May 2, 2024

Conversation

florianduros
Copy link
Contributor

@florianduros florianduros commented Apr 30, 2024

Checklist

  • Tests written for new code (and old code if feasible).
  • New or updated public/exported symbols have accurate TSDoc documentation.
  • Linter and other CI checks pass.
  • Sign-off given on the changes (see CONTRIBUTING.md).

Fix part of element-hq/element-web#27412

@florianduros florianduros added the T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems label Apr 30, 2024
@florianduros florianduros force-pushed the florianduros/tac/ra-closing branch from f10a718 to 50f35a2 Compare April 30, 2024 16:32
@florianduros florianduros changed the title Close Release Announcement when TAC button is opened Close Release Announcement when TAC button is clicked Apr 30, 2024
@florianduros florianduros changed the title Close Release Announcement when TAC button is clicked TAC: Close Release Announcement when TAC button is clicked Apr 30, 2024
@florianduros florianduros added X-Release-Blocker This affects the current release cycle and must be solved for a release to happen backport staging Label to automatically backport PR to staging branch labels Apr 30, 2024
# Conflicts:
#	test/components/views/spaces/ThreadsActivityCentre-test.tsx
@florianduros florianduros marked this pull request as ready for review May 2, 2024 07:54
@florianduros florianduros requested a review from a team as a code owner May 2, 2024 07:54
@florianduros florianduros requested review from dbkr and MidhunSureshR May 2, 2024 07:54
@florianduros florianduros enabled auto-merge May 2, 2024 07:54
@florianduros florianduros added this pull request to the merge queue May 2, 2024
Merged via the queue into develop with commit 6a3741b May 2, 2024
30 checks passed
@florianduros florianduros deleted the florianduros/tac/ra-closing branch May 2, 2024 08:36
@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-12475-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6a3741b7794bc16ad75f392a44b1b07d5e50f432
# Push it to GitHub
git push --set-upstream origin backport-12475-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-12475-to-staging.

florianduros added a commit that referenced this pull request May 2, 2024
* Close RA when TAC button is clicked

* Update snapshots

(cherry picked from commit 6a3741b)
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-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems 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.

3 participants