Merge branch '7.5' into backport/7.5/pr-49797

elastic · Nov 12, 2019 · 4ff09bc · 4ff09bc
2 parents 5c358a9 + 6540df0
commit 4ff09bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
   "dependencies": {
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.5.5",
-    "@elastic/charts": "^13.5.9",
+    "@elastic/charts": "^13.5.12",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
     "@elastic/eui": "14.5.1",

diff --git a/x-pack/legacy/plugins/uptime/common/constants/plugin.ts b/x-pack/legacy/plugins/uptime/common/constants/plugin.ts
@@ -7,6 +7,6 @@
 export const PLUGIN = {
   APP_ROOT_ID: 'react-uptime-root',
   ID: 'uptime',
-  ROUTER_BASE_NAME: '/app/uptime',
+  ROUTER_BASE_NAME: '/app/uptime#',
   LOCAL_STORAGE_KEY: 'xpack.uptime',
 };
diff --git a/yarn.lock b/yarn.lock
@@ -1064,10 +1064,10 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@elastic/charts@^13.5.9":
-  version "13.5.9"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-13.5.9.tgz#8e27ec7de934e20a9b853921cd453a372be99ef4"
-  integrity sha512-H5xsW/tEpjZhm0FpZThMyjuVBWlcXF2ImpfTWYv13p8GKmorCyQWbePau9Ya8N3lMmkHUMH2e95ifd3K3g9RgA==
+"@elastic/charts@^13.5.12":
+  version "13.5.12"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-13.5.12.tgz#95bd92389ec5fb411debfa5979091b6da2e4b123"
+  integrity sha512-MMNuebZ5jmzXkUJZr/mSvmtWNIR0gWGBtbqpZBfq3T9WRQPvnEHeE/N1WmXw2BSvwN86fy1i0gr52izh/nfzjQ==
   dependencies:
     "@types/d3-shape" "^1.3.1"
     classnames "^2.2.6"