Commit 4472f31c authored by Mike Greiling's avatar Mike Greiling

Merge branch 'leipert-migrate-gitlab-svgs' into 'master'

Rename @gitlab-org/gitlab-svgs to @gitlab/svgs

See merge request gitlab-org/gitlab-ce!22714
parents 95a87689 4ceabef9
<script> <script>
import _ from 'underscore'; 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 elasticsearchLogo from 'images/cluster_app_logos/elasticsearch.png';
import gitlabLogo from 'images/cluster_app_logos/gitlab.png'; import gitlabLogo from 'images/cluster_app_logos/gitlab.png';
import helmLogo from 'images/cluster_app_logos/helm.png'; import helmLogo from 'images/cluster_app_logos/helm.png';
......
...@@ -8,7 +8,7 @@ let iconValidator = () => true; ...@@ -8,7 +8,7 @@ let iconValidator = () => true;
*/ */
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
// eslint-disable-next-line global-require // 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; const { icons } = data;
iconValidator = value => { iconValidator = value => {
if (icons.includes(value)) { if (icons.includes(value)) {
......
...@@ -153,6 +153,6 @@ module IconsHelper ...@@ -153,6 +153,6 @@ module IconsHelper
private private
def known_sprites 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
end end
...@@ -144,7 +144,7 @@ module Gitlab ...@@ -144,7 +144,7 @@ module Gitlab
config.assets.precompile << "errors.css" config.assets.precompile << "errors.css"
# Import gitlab-svgs directly from vendored directory # Import gitlab-svgs directly from vendored directory
config.assets.paths << "#{config.root}/node_modules/@gitlab-org/gitlab-svgs/dist" config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"
config.assets.precompile << "icons.svg" config.assets.precompile << "icons.svg"
config.assets.precompile << "icons.json" config.assets.precompile << "icons.json"
config.assets.precompile << "illustrations/*.svg" config.assets.precompile << "illustrations/*.svg"
......
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
:versions: [] :versions: []
:when: 2017-09-13 17:31:16.425819400 Z :when: 2017-09-13 17:31:16.425819400 Z
- - :license - - :license
- "@gitlab-org/gitlab-svgs" - "@gitlab/svgs"
- MIT - MIT
- :who: Tim Zallmann - :who: Tim Zallmann
:why: Our own library - GitLab License https://gitlab.com/gitlab-org/gitlab-svgs :why: Our own library - GitLab License https://gitlab.com/gitlab-org/gitlab-svgs
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
We manage our own Icon and Illustration library in the [gitlab-svgs][gitlab-svgs] repository. We manage our own Icon and Illustration library in the [gitlab-svgs][gitlab-svgs] repository.
This repository is published on [npm][npm] and managed as a dependency via yarn. This repository is published on [npm][npm] and managed as a dependency via yarn.
You can browse all available Icons and Illustrations [here][svg-preview]. You can browse all available Icons and Illustrations [here][svg-preview].
To upgrade to a new version run `yarn upgrade @gitlab-org/gitlab-svgs`. To upgrade to a new version run `yarn upgrade @gitlab/svgs`.
## Icons ## Icons
...@@ -111,6 +111,6 @@ export default { ...@@ -111,6 +111,6 @@ export default {
</template> </template>
``` ```
[npm]: https://www.npmjs.com/package/@gitlab-org/gitlab-svgs [npm]: https://www.npmjs.com/package/@gitlab/svgs
[gitlab-svgs]: https://gitlab.com/gitlab-org/gitlab-svgs [gitlab-svgs]: https://gitlab.com/gitlab-org/gitlab-svgs
[svg-preview]: https://gitlab-org.gitlab.io/gitlab-svgs [svg-preview]: https://gitlab-org.gitlab.io/gitlab-svgs
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
@babel/template,7.1.2,MIT @babel/template,7.1.2,MIT
@babel/traverse,7.1.0,MIT @babel/traverse,7.1.0,MIT
@babel/types,7.1.2,MIT @babel/types,7.1.2,MIT
@gitlab-org/gitlab-svgs,1.31.0,MIT @gitlab/svgs,1.35.0,MIT
@gitlab-org/gitlab-ui,1.8.0,MIT @gitlab-org/gitlab-ui,1.8.0,MIT
@sindresorhus/is,0.7.0,MIT @sindresorhus/is,0.7.0,MIT
@types/jquery,2.0.48,MIT @types/jquery,2.0.48,MIT
......
...@@ -621,11 +621,6 @@ ...@@ -621,11 +621,6 @@
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.32.0.tgz#a65ab7724fa7d55be8e5cc9b2dbe3f0757432fd3" resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.32.0.tgz#a65ab7724fa7d55be8e5cc9b2dbe3f0757432fd3"
integrity sha512-L3o8dFUd2nSkVZBwh2hCJWzNzADJ3dTBZxamND8NLosZK9/ohNhccmsQOZGyMCUHaOzm4vifaaXkAXh04UtMKA== integrity sha512-L3o8dFUd2nSkVZBwh2hCJWzNzADJ3dTBZxamND8NLosZK9/ohNhccmsQOZGyMCUHaOzm4vifaaXkAXh04UtMKA==
"@gitlab-org/gitlab-svgs@^1.33.0":
version "1.33.0"
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.33.0.tgz#068566e8ee00795f6f09f58236f08e1716f9f04a"
integrity sha512-8ajtUHk6gQ1xosL/CO5IzHSFM/t18hx5pfzQ3cd0VuQXcyR6QKGuXTLwbYdmJDYOw1Etoo5DqDWxPEClHyZpiA==
"@gitlab-org/gitlab-ui@^1.10.0": "@gitlab-org/gitlab-ui@^1.10.0":
version "1.10.0" version "1.10.0"
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.10.0.tgz#3ac54ecaa25ea558324f0b382c97fcf9e3c4f0a5" resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.10.0.tgz#3ac54ecaa25ea558324f0b382c97fcf9e3c4f0a5"
...@@ -648,6 +643,11 @@ ...@@ -648,6 +643,11 @@
eslint-plugin-promise "^4.0.1" eslint-plugin-promise "^4.0.1"
eslint-plugin-vue "^5.0.0-beta.3" eslint-plugin-vue "^5.0.0-beta.3"
"@gitlab/svgs@^1.35.0":
version "1.35.0"
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.35.0.tgz#01b6a0948bb3897fbbac9f50ce23c559c514ea0e"
integrity sha512-XKrTniSYKG5U8+8ZqDJqoW8ORahuPBfHrfsC1dHBPvo1xA/QGJxlpUdeqSFw2O19h481ut4yW1dF+OFpIa/mrw==
"@sindresorhus/is@^0.7.0": "@sindresorhus/is@^0.7.0":
version "0.7.0" version "0.7.0"
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment