Skip to content

Commit 2ca38a4

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/vm-check-channel
2 parents 1e8475e + 3c106a6 commit 2ca38a4

File tree

266 files changed

+392
-13216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+392
-13216
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
# Argo CD inputs
4444
grafana-cloud-deployment-type: provisioned
4545
argo-workflow-slack-channel: "#sm-ops-deploys"
46+
auto-merge-environments: dev, ops, prod-canary
4647

4748
# Other CI inputs
4849
node-version: 22

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@types/eslint": "9.6.1",
4949
"@types/is-base64": "1.1.3",
5050
"@types/jest": "30.0.0",
51-
"@types/k6": "0.57.1",
51+
"@types/k6": "1.5.0",
5252
"@types/lodash": "4.17.21",
5353
"@types/node": "24.10.1",
5454
"@types/prismjs": "1.26.5",
@@ -125,7 +125,7 @@
125125
"ip-address": "10.1.0",
126126
"is-base64": "^1.1.0",
127127
"js-base64": "^3.7.7",
128-
"lodash": "4.17.21",
128+
"lodash": "4.17.23",
129129
"ol": "10.7.0",
130130
"pluralize": "^8.0.0",
131131
"prismjs": "1.30.0",

src/components/CheckEditor/CheckEditor.types.ts

Lines changed: 0 additions & 102 deletions
This file was deleted.

src/components/CheckEditor/FormComponents/BrowserCheckInstance.tsx

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/components/CheckEditor/FormComponents/BrowserCheckScript.tsx

Lines changed: 0 additions & 73 deletions
This file was deleted.

src/components/CheckEditor/FormComponents/CheckEnabled.tsx

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/components/CheckEditor/FormComponents/CheckIpVersion.tsx

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/components/CheckEditor/FormComponents/CheckJobName.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/components/CheckEditor/FormComponents/CheckPublishedAdvanceMetrics.tsx

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)