Skip to content

Commit

Permalink
Merge branch 'master' into add-breadcrumb-support
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Sep 10, 2021
2 parents ca9f494 + 13560c0 commit 078e85b
Show file tree
Hide file tree
Showing 50 changed files with 2,075 additions and 703 deletions.
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"**/pdfkit/crypto-js": "4.0.0",
"**/react-syntax-highlighter": "^15.3.1",
"**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
"**/request": "^2.88.2",
"**/trim": "1.0.1",
"**/typescript": "4.1.3",
"**/underscore": "^1.13.1"
Expand Down Expand Up @@ -368,7 +367,6 @@
"regenerator-runtime": "^0.13.3",
"remark-parse": "^8.0.3",
"remark-stringify": "^9.0.0",
"request": "^2.88.0",
"require-in-the-middle": "^5.0.2",
"reselect": "^4.0.0",
"resize-observer-polyfill": "^1.5.0",
Expand Down Expand Up @@ -606,7 +604,6 @@
"@types/recompose": "^0.30.6",
"@types/reduce-reducers": "^1.0.0",
"@types/redux-actions": "^2.6.1",
"@types/request": "^2.48.2",
"@types/seedrandom": ">=2.0.0 <4.0.0",
"@types/selenium-webdriver": "^4.0.9",
"@types/semver": "^7",
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-ui-shared-deps/src/entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ export const KbnStd = require('@kbn/std');
export const SaferLodashSet = require('@elastic/safer-lodash-set');
export const RisonNode = require('rison-node');
export const History = require('history');
export const Classnames = require('classnames');
1 change: 1 addition & 0 deletions packages/kbn-ui-shared-deps/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ exports.externals = {
'@elastic/safer-lodash-set': '__kbnSharedDeps__.SaferLodashSet',
'rison-node': '__kbnSharedDeps__.RisonNode',
history: '__kbnSharedDeps__.History',
classnames: '__kbnSharedDeps__.Classnames',
};

/**
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/home/common/instruction_variant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const DISPLAY_MAP = {
[INSTRUCTION_VARIANT.LINUX]: 'Linux',
[INSTRUCTION_VARIANT.PHP]: 'PHP',
[INSTRUCTION_VARIANT.FLEET]: i18n.translate('home.tutorial.instruction_variant.fleet', {
defaultMessage: 'Elastic APM (beta) in Fleet',
defaultMessage: 'Elastic APM in Fleet',
}),
};

Expand Down
Loading

0 comments on commit 078e85b

Please sign in to comment.