Skip to content

Commit

Permalink
Merge branch 'master' into search-handle-warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Aug 12, 2021
2 parents 20dd68a + 7860c2a commit 774373c
Show file tree
Hide file tree
Showing 1,672 changed files with 29,267 additions and 17,422 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,17 @@

# Maps
#CC# /x-pack/plugins/maps/ @elastic/kibana-gis
/x-pack/plugins/maps/ @elastic/kibana-gis
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
/x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
/x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
/src/plugins/maps_legacy/ @elastic/kibana-gis
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
/x-pack/plugins/file_upload @elastic/kibana-gis
/src/plugins/tile_map/ @elastic/kibana-gis
/src/plugins/region_map/ @elastic/kibana-gis
/packages/kbn-mapbox-gl @elastic/kibana-gis
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ report.asciidoc
# TS incremental build cache
*.tsbuildinfo

# Automatically generated and user-modifiable
/tsconfig.refs.json

# Yarn local mirror content
.yarn-local-mirror

Expand Down
2 changes: 2 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
exports_files(
[
"tsconfig.base.json",
"tsconfig.bazel.json",
"tsconfig.browser.json",
"tsconfig.browser_bazel.json",
"tsconfig.json",
"package.json"
],
Expand Down
2 changes: 1 addition & 1 deletion STYLEGUIDE.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ remove it, don't simply comment it out.

We are gradually moving the Kibana code base over to Prettier. All TypeScript code
and some JavaScript code (check `.eslintrc.js`) is using Prettier to format code. You
can run `node script/eslint --fix` to fix linting issues and apply Prettier formatting.
can run `node scripts/eslint --fix` to fix linting issues and apply Prettier formatting.
We recommend you to enable running ESLint via your IDE.

Whenever possible we are trying to use Prettier and linting over written style guide rules.
Expand Down
4 changes: 2 additions & 2 deletions api_docs/charts.json
Original file line number Diff line number Diff line change
Expand Up @@ -2539,7 +2539,7 @@
"text": "Adapters"
},
", ",
"SerializableState",
"Serializable",
">>"
],
"path": "src/plugins/charts/common/palette.ts",
Expand Down Expand Up @@ -2597,7 +2597,7 @@
"text": "Adapters"
},
", ",
"SerializableState",
"Serializable",
">>"
],
"path": "src/plugins/charts/common/palette.ts",
Expand Down
12 changes: 6 additions & 6 deletions api_docs/dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -1137,8 +1137,8 @@
"pluginId": "kibanaUtils",
"scope": "common",
"docId": "kibKibanaUtilsPluginApi",
"section": "def-common.SerializableState",
"text": "SerializableState"
"section": "def-common.Serializable",
"text": "Serializable"
}
],
"path": "src/plugins/dashboard/public/locator.ts",
Expand Down Expand Up @@ -1204,8 +1204,8 @@
"pluginId": "kibanaUtils",
"scope": "common",
"docId": "kibKibanaUtilsPluginApi",
"section": "def-common.SerializableState",
"text": "SerializableState"
"section": "def-common.Serializable",
"text": "Serializable"
},
") | undefined"
],
Expand Down Expand Up @@ -1334,8 +1334,8 @@
"pluginId": "kibanaUtils",
"scope": "common",
"docId": "kibKibanaUtilsPluginApi",
"section": "def-common.SerializableState",
"text": "SerializableState"
"section": "def-common.Serializable",
"text": "Serializable"
},
") | undefined"
],
Expand Down
Loading

0 comments on commit 774373c

Please sign in to comment.