diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-12 13:11:44 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-12 13:11:44 +0000 |
| commit | 0047869c27f0aede95f20de41c8498b7c23bf08d (patch) | |
| tree | b07658ce61b03b8d7d12a0f8daca9d3baff7bf05 | |
| parent | 32055e21f52e360a8f8e15b115cf3d0641176eea (diff) | |
| parent | 97701019e6f159e0e01d415f39172104286ae3c2 (diff) | |
| download | gitlab-ce-0047869c27f0aede95f20de41c8498b7c23bf08d.tar.gz | |
Merge branch 'fl-update-svgs' into 'master'
Updates gitlab-svg dependency
See merge request gitlab-org/gitlab-ce!22299
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fl-update-svgs.yml | 5 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
4 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index a1069985178..6e7b5eb5526 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -1,6 +1,6 @@ <script> import _ from 'underscore'; -import helmInstallIllustration from '@gitlab-org/gitlab-svgs/illustrations/kubernetes-installation.svg'; +import helmInstallIllustration from '@gitlab-org/gitlab-svgs/dist/illustrations/kubernetes-installation.svg'; import elasticsearchLogo from 'images/cluster_app_logos/elasticsearch.png'; import gitlabLogo from 'images/cluster_app_logos/gitlab.png'; import helmLogo from 'images/cluster_app_logos/helm.png'; diff --git a/changelogs/unreleased/fl-update-svgs.yml b/changelogs/unreleased/fl-update-svgs.yml new file mode 100644 index 00000000000..e6e76617df1 --- /dev/null +++ b/changelogs/unreleased/fl-update-svgs.yml @@ -0,0 +1,5 @@ +--- +title: Updates svg dependency +merge_request: +author: +type: other diff --git a/package.json b/package.json index ac9a73cd2c9..dafb03bf75a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-syntax-import-meta": "^7.0.0", "@babel/preset-env": "^7.1.0", - "@gitlab-org/gitlab-svgs": "^1.29.0", + "@gitlab-org/gitlab-svgs": "^1.32.0", "@gitlab-org/gitlab-ui": "^1.8.0", "autosize": "^4.0.0", "axios": "^0.17.1", diff --git a/yarn.lock b/yarn.lock index 25ea8d7557c..5879ccb9267 100644 --- a/yarn.lock +++ b/yarn.lock @@ -616,10 +616,10 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.29.0": - version "1.31.0" - resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.31.0.tgz#495b074669f93af40e34f9978ce887773dea470a" - integrity sha512-tJbf99XX/ddFkXCXxQr9a0GJD9rPVoW3qMbU14dkxwG4WBmPEoVg+e7sLvm9OWTD1uUqiVW3qWKp++SGhhcRlw== +"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.32.0": + version "1.32.0" + resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.32.0.tgz#a65ab7724fa7d55be8e5cc9b2dbe3f0757432fd3" + integrity sha512-L3o8dFUd2nSkVZBwh2hCJWzNzADJ3dTBZxamND8NLosZK9/ohNhccmsQOZGyMCUHaOzm4vifaaXkAXh04UtMKA== "@gitlab-org/gitlab-ui@^1.8.0": version "1.8.0" |