Skip to content

Commit f30f689

Browse files
Merge branch 'master' into dls.apm.cl
2 parents cb2446e + 4416a31 commit f30f689

File tree

329 files changed

+5322
-3071
lines changed

Some content is hidden

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

329 files changed

+5322
-3071
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
/src/plugins/discover/ @elastic/kibana-data-discovery
1717
/x-pack/plugins/discover_enhanced/ @elastic/kibana-data-discovery
1818
/test/functional/apps/discover/ @elastic/kibana-data-discovery
19+
/x-pack/plugins/graph/ @elastic/kibana-data-discovery
20+
/x-pack/test/functional/apps/graph @elastic/kibana-data-discovery
1921

2022
# Vis Editors
2123
/x-pack/plugins/lens/ @elastic/kibana-vis-editors
22-
/x-pack/plugins/graph/ @elastic/kibana-vis-editors
2324
/src/plugins/advanced_settings/ @elastic/kibana-vis-editors
2425
/src/plugins/charts/ @elastic/kibana-vis-editors
2526
/src/plugins/management/ @elastic/kibana-vis-editors

.github/workflows/sync-main-branch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
sync_latest_from_upstream:
1010
runs-on: ubuntu-latest
1111
name: Sync latest commits from master branch
12+
if: github.repository == 'elastic/kibana'
1213

1314
steps:
1415
- name: Checkout target repo

docs/developer/plugin-list.asciidoc

Lines changed: 1 addition & 1 deletion

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

Lines changed: 2 additions & 2 deletions

docs/settings/logging-settings.asciidoc

Lines changed: 20 additions & 8 deletions

docs/setup/settings.asciidoc

Lines changed: 0 additions & 6 deletions

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.

0 commit comments

Comments
 (0)