Skip to content

Amend e2e normal icon from lock-solid to info#31555

Merged
t3chguy merged 2 commits into
developfrom
t3chguy/fix-e2e-icons-again
Dec 16, 2025
Merged

Amend e2e normal icon from lock-solid to info#31555
t3chguy merged 2 commits into
developfrom
t3chguy/fix-e2e-icons-again

Conversation

@t3chguy
Copy link
Copy Markdown
Member

@t3chguy t3chguy commented Dec 16, 2025

Fixes #31556

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy added this pull request to the merge queue Dec 16, 2025
Merged via the queue into develop with commit 773662e Dec 16, 2025
42 checks passed
@t3chguy t3chguy deleted the t3chguy/fix-e2e-icons-again branch December 16, 2025 12:47
@RiotRobot
Copy link
Copy Markdown
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-31555-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 773662e018f7e6a6dfe7b595bf6f8d6869d6ce21
# Push it to GitHub
git push --set-upstream origin backport-31555-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-31555-to-staging.

t3chguy added a commit that referenced this pull request Dec 16, 2025
* Amend e2e normal icon from lock-solid to info

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update screenshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 773662e)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
github-merge-queue Bot pushed a commit that referenced this pull request Dec 16, 2025
)

* Amend e2e normal icon from lock-solid to info (#31555)

* Amend e2e normal icon from lock-solid to info

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update screenshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 773662e)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update screenshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Encryption icon on the event tile should be a "i" icon not a padlock

3 participants