Skip to content

Commit 735a447

Browse files
authored
Merge branch '7.x' into backport/7.x/pr-63389
2 parents 8f11528 + 8061426 commit 735a447

File tree

488 files changed

+12753
-6992
lines changed

Some content is hidden

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

488 files changed

+12753
-6992
lines changed

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"src/legacy/core_plugins/management",
2525
"src/plugins/management"
2626
],
27+
"maps_legacy": "src/plugins/maps_legacy",
2728
"indexPatternManagement": "src/plugins/index_pattern_management",
2829
"advancedSettings": "src/plugins/advanced_settings",
2930
"kibana_legacy": "src/plugins/kibana_legacy",

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
"@types/recompose": "^0.30.6",
373373
"@types/redux-actions": "^2.6.1",
374374
"@types/request": "^2.48.2",
375-
"@types/selenium-webdriver": "4.0.9",
375+
"@types/selenium-webdriver": "^4.0.5",
376376
"@types/semver": "^5.5.0",
377377
"@types/sinon": "^7.0.13",
378378
"@types/strip-ansi": "^3.0.0",
@@ -457,7 +457,6 @@
457457
"load-grunt-config": "^3.0.1",
458458
"mocha": "^7.1.1",
459459
"mock-http-server": "1.3.0",
460-
"ms-chromium-edge-driver": "^0.2.0",
461460
"multistream": "^2.1.1",
462461
"murmurhash3js": "3.0.1",
463462
"mutation-observer": "^1.0.3",
@@ -476,7 +475,7 @@
476475
"react-textarea-autosize": "^7.1.2",
477476
"regenerate": "^1.4.0",
478477
"sass-lint": "^1.12.1",
479-
"selenium-webdriver": "^4.0.0-alpha.7",
478+
"selenium-webdriver": "^4.0.0-alpha.5",
480479
"simple-git": "1.116.0",
481480
"simplebar-react": "^2.1.0",
482481
"sinon": "^7.4.2",

0 commit comments

Comments
 (0)