Commit 1940ba2
committed
Merge remote-tracking branch 'origin/main' into worktree-oteliq-perf-pr1
# Conflicts:
# CHANGELOG.md
# ui/src/App.tsx
# ui/src/__tests__/App.test.tsx
# ui/src/components/common/ServiceGroups.module.css
# ui/src/components/common/ServiceGroups.tsx
# ui/src/components/common/ServiceRow.module.css
# ui/src/components/common/ServiceRow.tsx
# ui/src/components/common/ToneBadge.module.css
# ui/src/components/inspector/ServiceInspector.module.css
# ui/src/components/inspector/ServiceInspector.tsx
# ui/src/components/inspector/WhyTab.tsx
# ui/src/components/inspector/__tests__/ImpactTab.test.tsx
# ui/src/components/inspector/__tests__/WhyTab.test.tsx
# ui/src/components/inspector/inspectorTabs.tsx
# ui/src/components/map/FlowMap.module.css
# ui/src/components/map/FlowMap.tsx
# ui/src/components/palette/CommandPalette.tsx
# ui/src/components/palette/ShortcutSheet.tsx
# ui/src/components/palette/__tests__/PaletteHost.test.tsx
# ui/src/components/palette/palette.module.css
# ui/src/components/shell/ConnectInline.module.css
# ui/src/components/shell/ConnectPopover.module.css
# ui/src/components/shell/LiveDot.module.css
# ui/src/components/shell/LiveDot.tsx
# ui/src/components/shell/PulseBar.module.css
# ui/src/components/shell/PulseBar.tsx
# ui/src/components/shell/Shell.module.css
# ui/src/components/shell/Shell.tsx
# ui/src/components/shell/__tests__/PulseBar.test.tsx
# ui/src/components/shell/__tests__/Shell.test.tsx
# ui/src/components/trail/TrailBar.module.css
# ui/src/components/triage/AnomalyStrip.module.css
# ui/src/components/triage/AnomalyStrip.tsx
# ui/src/hooks/__tests__/useGlobalKeys.test.tsx
# ui/src/hooks/__tests__/useInvestigation.test.tsx
# ui/src/hooks/useGlobalKeys.ts
# ui/src/hooks/useInvestigation.ts
# ui/src/lib/__tests__/chords.test.ts
# ui/src/lib/__tests__/dagLayout.test.ts
# ui/src/lib/__tests__/palette.test.ts
# ui/src/lib/chords.ts
# ui/src/lib/dagLayout.ts
# ui/src/lib/palette.ts
# ui/src/lib/trail.ts
# ui/src/styles/global.css
# ui/src/styles/tokens.css1 file changed
Lines changed: 13 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
16 | 26 | | |
17 | 27 | | |
18 | 28 | | |
| |||
256 | 266 | | |
257 | 267 | | |
258 | 268 | | |
259 | | - | |
| 269 | + | |
| 270 | + | |
260 | 271 | | |
261 | 272 | | |
262 | 273 | | |
| |||
0 commit comments