diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-10-31 20:18:39 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-10-31 20:18:39 +0000 |
commit | 4472f31c33227f34150226b04f4c597797bb1825 (patch) | |
tree | bc6e35dddc3685ae912f87dcde094ecc6218a3ec /app | |
parent | 95a87689778a1944104e562f82d3c347a0fa6241 (diff) | |
parent | 4ceabef9d2bda6d72b01fb650c61c4ba1df94bbf (diff) | |
download | gitlab-ce-4472f31c33227f34150226b04f4c597797bb1825.tar.gz |
Merge branch 'leipert-migrate-gitlab-svgs' into 'master'
Rename @gitlab-org/gitlab-svgs to @gitlab/svgs
See merge request gitlab-org/gitlab-ce!22714
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/icon.vue | 2 | ||||
-rw-r--r-- | app/helpers/icons_helper.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 6e7b5eb5526..6d7f45a35d8 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/dist/illustrations/kubernetes-installation.svg'; +import helmInstallIllustration from '@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/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue index 26f9d5ddc91..cddebfae115 100644 --- a/app/assets/javascripts/vue_shared/components/icon.vue +++ b/app/assets/javascripts/vue_shared/components/icon.vue @@ -8,7 +8,7 @@ let iconValidator = () => true; */ if (process.env.NODE_ENV !== 'production') { // eslint-disable-next-line global-require - const data = require('@gitlab-org/gitlab-svgs/dist/icons.json'); + const data = require('@gitlab/svgs/dist/icons.json'); const { icons } = data; iconValidator = value => { if (icons.includes(value)) { diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 037004327b9..910c9e9446f 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -153,6 +153,6 @@ module IconsHelper private def known_sprites - @known_sprites ||= JSON.parse(File.read(Rails.root.join('node_modules/@gitlab-org/gitlab-svgs/dist/icons.json')))['icons'] + @known_sprites ||= JSON.parse(File.read(Rails.root.join('node_modules/@gitlab/svgs/dist/icons.json')))['icons'] end end |