Skip to content

fix(ui): compliance card layout polish#10977

Merged
HugoPBrito merged 3 commits into
v5.25from
backport/v5.25/pr-10939
May 4, 2026
Merged

fix(ui): compliance card layout polish#10977
HugoPBrito merged 3 commits into
v5.25from
backport/v5.25/pr-10939

Conversation

@prowler-bot

Copy link
Copy Markdown
Collaborator

Backport

This will backport the following commits from master to v5.25:

Questions ?

Please refer to the Backport tool documentation


Note: This PR was created with conflicts auto-resolved in favor of the source commit (--strategy-option=theirs). Please review the changes carefully.

(cherry picked from commit 652cb69)

# Conflicts:
#	ui/CHANGELOG.md
@prowler-bot prowler-bot requested a review from a team as a code owner May 4, 2026 12:00
@prowler-bot prowler-bot added the backport This PR contains a backport - Do not set this manually label May 4, 2026
@github-actions github-actions Bot added component/ui has-conflicts The PR has conflicts that needs to be resolved. labels May 4, 2026
@github-actions

github-actions Bot commented May 4, 2026

Copy link
Copy Markdown
Contributor

✅ All necessary CHANGELOG.md files have been updated.

@github-actions

github-actions Bot commented May 4, 2026

Copy link
Copy Markdown
Contributor

Conflict Markers Resolved

All conflict markers have been successfully resolved in this pull request.

HugoPBrito
HugoPBrito previously approved these changes May 4, 2026
Removed merge conflict markers and updated changelog for version 1.25.2.
@github-actions github-actions Bot removed the has-conflicts The PR has conflicts that needs to be resolved. label May 4, 2026
HugoPBrito
HugoPBrito previously approved these changes May 4, 2026
@github-actions

github-actions Bot commented May 4, 2026

Copy link
Copy Markdown
Contributor

🔒 Container Security Scan

Image: prowler-ui:6e9f5a0
Last scan: 2026-05-04 14:07:13 UTC

📊 Vulnerability Summary

Severity Count
🔴 Critical 2
Total 2

2 package(s) affected

⚠️ Action Required

Critical severity vulnerabilities detected. These should be addressed before merging:

  • Review the detailed scan results
  • Update affected packages to patched versions
  • Consider using a different base image if updates are unavailable

📋 Resources:

@HugoPBrito HugoPBrito merged commit 0719f69 into v5.25 May 4, 2026
37 checks passed
@HugoPBrito HugoPBrito deleted the backport/v5.25/pr-10939 branch May 4, 2026 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR contains a backport - Do not set this manually component/ui

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants