Commit 2483a2f
committed
Merge main into codex/statuspage-migrate-cli
Resolve conflicts in .gitignore, internal/cli/root.go, and
internal/cli/status_page.go. Keep main's three-group goimports layout
and newClientFn factory pattern; add PR's loadResolvedConfig helper
(consumed by status_page_migrate.go) and reuse it from defaultNewClient
to avoid duplicating flag-override logic. Keep PR's README expansion
for the statuspage section; drop PR's docs/superpowers/ gitignore in
favor of main's broader docs/ rule.81 files changed
Lines changed: 9364 additions & 2181 deletions
File tree
- .github/workflows
- cmd/flashduty
- docs/plans
- e2e
- internal
- cli
- config
- output
- timeutil
- skills
- flashduty-admin
- flashduty-alert
- flashduty-change
- flashduty-channel
- flashduty-incident
- references
- flashduty-insight
- flashduty-oncall
- flashduty-template
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
3 | 5 | | |
4 | 6 | | |
5 | 7 | | |
6 | 8 | | |
7 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
8 | 16 | | |
9 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
10 | 20 | | |
11 | | - | |
| 21 | + | |
12 | 22 | | |
13 | 23 | | |
14 | 24 | | |
15 | 25 | | |
16 | 26 | | |
17 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
18 | 46 | | |
19 | 47 | | |
20 | | - | |
21 | | - | |
22 | | - | |
| 48 | + | |
23 | 49 | | |
24 | 50 | | |
25 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
26 | 68 | | |
27 | 69 | | |
28 | 70 | | |
| |||
0 commit comments