Merge branch 'ce-to-ee-2018-05-14' into 'master'

CE upstream - 2018-05-14 18:24 UTC

See merge request gitlab-org/gitlab-ee!5701

changelogs/unreleased/46345-kubernetes-popover-illustration-skewed.yml

+---
+title: Correct skewed Kubernetes popover illustration
+merge_request: 18949
+author:
+type: fixed

package.json

@@ -16,7 +16,7 @@
     "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
   },
   "dependencies": {
-    "@gitlab-org/gitlab-svgs": "^1.20.0",
+    "@gitlab-org/gitlab-svgs": "^1.22.0",
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-core": "^6.26.3",

yarn.lock

@@ -54,9 +54,9 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@gitlab-org/gitlab-svgs@^1.20.0":
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.20.0.tgz#4c3fa3a91e0693114654b0066fb1ef04c0602047"
+"@gitlab-org/gitlab-svgs@^1.22.0":
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.22.0.tgz#9f2daefebcda911cba8341313c8c464c8087fe44"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"