Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into 195211-rule-form-pa…
Browse files Browse the repository at this point in the history
…ckage

# Conflicts:
#	packages/response-ops/rule_form/src/rule_actions/rule_actions_system_actions_item.tsx
#	x-pack/plugins/observability_solution/observability/tsconfig.json
#	x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/system_action_type_form.tsx
  • Loading branch information
Zacqary committed Nov 25, 2024
2 parents 8c3c9ea + 0ab703e commit 6401b97
Show file tree
Hide file tree
Showing 1,257 changed files with 17,735 additions and 7,716 deletions.
243 changes: 105 additions & 138 deletions .buildkite/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .buildkite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/mocha": "^10.0.1",
"@types/node": "^15.12.2",
"chai": "^4.3.10",
"mocha": "^10.3.0",
"mocha": "^10.8.2",
"nock": "^12.0.2",
"ts-node": "^10.9.2",
"typescript": "^5.1.6"
Expand Down
Loading

0 comments on commit 6401b97

Please sign in to comment.