summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-05-14 17:58:36 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2018-05-15 08:16:04 -0500
commitd8d10b29b22133d9a6381027bdc181f061ed1dbb (patch)
treeab8cf2f60a3e78c8cef173c357110ce7b56a3a2c
parent898fff9c7d155f85223e47dd52ecfb5b35b27811 (diff)
downloadgitlab-ce-d8d10b29b22133d9a6381027bdc181f061ed1dbb.tar.gz
Merge branch '46345-kubernetes-popover-illustration-skewed' into 'master'
Correct skewed Kubernetes popover illustration Closes #46345 See merge request gitlab-org/gitlab-ce!18949
-rw-r--r--changelogs/unreleased/46345-kubernetes-popover-illustration-skewed.yml5
-rw-r--r--package.json2
-rw-r--r--yarn.lock6
3 files changed, 9 insertions, 4 deletions
diff --git a/changelogs/unreleased/46345-kubernetes-popover-illustration-skewed.yml b/changelogs/unreleased/46345-kubernetes-popover-illustration-skewed.yml
new file mode 100644
index 00000000000..a0e6b39fef6
--- /dev/null
+++ b/changelogs/unreleased/46345-kubernetes-popover-illustration-skewed.yml
@@ -0,0 +1,5 @@
+---
+title: Correct skewed Kubernetes popover illustration
+merge_request: 18949
+author:
+type: fixed
diff --git a/package.json b/package.json
index 9543dba1bbc..c664f22518a 100644
--- a/package.json
+++ b/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",
diff --git a/yarn.lock b/yarn.lock
index d3d04fa0d47..7e9f23e403b 100644
--- a/yarn.lock
+++ b/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"