Skip to content

Commit 36fa4cd

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into fix/olm-kibana-111210-bad-artifact-migration
2 parents fe33bb3 + 7b97b5c commit 36fa4cd

404 files changed

Lines changed: 5018 additions & 2305 deletions

File tree

Some content is hidden

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

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 1 addition & 1 deletion

‎docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md‎

Lines changed: 4 additions & 0 deletions

‎docs/development/core/public/kibana-plugin-core-public.doclinksstart.md‎

Lines changed: 3 additions & 1 deletion

‎docs/management/connectors/action-types/email.asciidoc‎

Lines changed: 1 addition & 1 deletion

‎docs/user/alerting/rule-types/es-query.asciidoc‎

Lines changed: 29 additions & 1 deletion

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
"react-moment-proptypes": "^1.7.0",
349349
"react-monaco-editor": "^0.41.2",
350350
"react-popper-tooltip": "^2.10.1",
351-
"react-query": "^3.21.0",
351+
"react-query": "^3.21.1",
352352
"react-redux": "^7.2.0",
353353
"react-resizable": "^1.7.5",
354354
"react-resize-detector": "^4.2.0",

‎packages/elastic-datemath/.babelrc‎

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

‎packages/kbn-ace/.babelrc‎

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

‎packages/kbn-ace/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jsts_transpiler(
4545
srcs = SRCS,
4646
additional_args = [
4747
"--copy-files",
48+
"--ignore",
49+
"**/*/src/ace/modes/x_json/worker/x_json.ace.worker.js",
4850
"--quiet"
4951
],
5052
build_pkg_name = package_name(),

‎packages/kbn-alerts/.babelrc‎

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

0 commit comments

Comments
 (0)