summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-04-09 12:59:11 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-04-09 12:59:11 +0000
commit2224aa3b7f28487d5d06f34cc5761103c1a682e3 (patch)
treeaaf9aebdbde4d74cae540967d70ac07267008ca2
parentde36ca81d35992c265cd4fd09c774cb793dbd246 (diff)
parent1cf54d8c92a23f6017c468645337d426daeaf7a1 (diff)
downloadgitlab-ce-2224aa3b7f28487d5d06f34cc5761103c1a682e3.tar.gz
Merge branch 'update-svgs' into 'master'
Update GitLab SVGs version See merge request gitlab-org/gitlab-ce!18250
-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 56fd2575e91..27f612aca38 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.16.0",
+ "@gitlab-org/gitlab-svgs": "^1.17.0",
"autosize": "^4.0.0",
"axios": "^0.17.1",
"babel-core": "^6.26.0",
diff --git a/yarn.lock b/yarn.lock
index af7bda5d562..243b83f4471 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.16.0":
- version "1.16.0"
- resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.16.0.tgz#6c88a1bd9f5b3d3e5bf6a6d89d61724022185667"
+"@gitlab-org/gitlab-svgs@^1.17.0":
+ version "1.17.0"
+ resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.17.0.tgz#d0c74d9e44c127ccfad16941f352088b86f86c89"
"@types/jquery@^2.0.40":
version "2.0.48"