Skip to content

Commit

Permalink
Merge branch 'main' into LA-284-Fix-Cypress-E2E-flaky-test
Browse files Browse the repository at this point in the history
  • Loading branch information
lucanovera authored Jan 28, 2025
2 parents 9c9895b + 0f218f3 commit 024b83b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ const ClassificationCategoryBadge = ({
variant="taxonomy"
textTransform="none"
fontWeight="normal"
display="flex"
alignItems="center"
gap={1.5}
as={onClick ? "button" : undefined}
onClick={onClick}
_hover={onClick ? { borderColor: "primary.900" } : undefined}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from fides.api.models.detection_discovery import MonitorConfig
from fides.api.models.experience_notices import ExperienceNotices
from fides.api.models.privacy_experience import PrivacyExperienceConfig
from fides.api.service.connectors.sql_connector import PostgreSQLConnector
from fides.api.service.connectors.postgres_connector import PostgreSQLConnector
from fides.config import CONFIG

integration_config = load_toml("tests/ops/integration_test_config.toml")
Expand Down

0 comments on commit 024b83b

Please sign in to comment.