Skip to content

Commit

Permalink
Merge branch 'master' into ind-rac
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Aug 10, 2021
2 parents 19ebe68 + b4a736c commit 88c7fc3
Show file tree
Hide file tree
Showing 1,278 changed files with 23,420 additions and 16,912 deletions.
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
# The #CC# prefix delineates Code Coverage,
# used for the 'team' designator within Kibana Stats

# Tech leads
/dev_docs @elastic/kibana-tech-leads
/packages/kbn-docs-utils/ @elastic/kibana-tech-leads @elastic/kibana-operations

# App
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
/x-pack/plugins/lens/ @elastic/kibana-app
Expand Down Expand Up @@ -201,6 +205,7 @@
/test/functional/services/remote @elastic/kibana-qa

# Core
/examples/hello_world/ @elastic/kibana-core
/src/core/ @elastic/kibana-core
/src/plugins/saved_objects_tagging_oss @elastic/kibana-core
/config/kibana.yml @elastic/kibana-core
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 88c7fc3

Please sign in to comment.