Skip to content

Commit

Permalink
Merge branch 'master' into actions-jira-ui-title-api-key
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Aug 10, 2021
2 parents ef014fc + 4f7e62f commit c2632d9
Show file tree
Hide file tree
Showing 735 changed files with 11,588 additions and 10,274 deletions.
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 c2632d9

Please sign in to comment.