summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-19 10:22:30 +0000
committerPhil Hughes <me@iamphill.com>2018-03-19 10:22:30 +0000
commit3488382a9aa4815a785003963be56a098527ec5d (patch)
treeaa1566486cf54e3401c17ddadd468d3dfbdc6a89
parente1739e47c5664c93c66dd58ded59f9d79cd8a426 (diff)
parentafa002c10d04e4909186920409319d254fe641ee (diff)
downloadgitlab-ce-3488382a9aa4815a785003963be56a098527ec5d.tar.gz
Merge branch 'fl-update-svgs' into 'master'
Updates svg dependency See merge request gitlab-org/gitlab-ce!17843
-rw-r--r--package.json2
-rw-r--r--yarn.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json
index deee668ae3b..c81020f631e 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.14.0",
+ "@gitlab-org/gitlab-svgs": "^1.16.0",
"autosize": "^4.0.0",
"axios": "^0.17.1",
"babel-core": "^6.26.0",
diff --git a/yarn.lock b/yarn.lock
index 3cc5445c402..36683a2a480 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.14.0":
- version "1.14.0"
- resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.14.0.tgz#b4a5cca3106f33224c5486cf674ba3b70cee727e"
+"@gitlab-org/gitlab-svgs@^1.16.0":
+ version "1.16.0"
+ resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.16.0.tgz#6c88a1bd9f5b3d3e5bf6a6d89d61724022185667"
"@types/jquery@^2.0.40":
version "2.0.48"