diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-15 19:45:02 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-15 19:45:02 +0000 |
| commit | c61cac595acd5bfac85cc431554e195ec4c32c26 (patch) | |
| tree | 4e0ac014a5dc51552dfbd792faf2ac3b02b2b5cc | |
| parent | 0f5faea404ab514917adf06768f1a0991482b5b5 (diff) | |
| download | gitlab-ce-c61cac595acd5bfac85cc431554e195ec4c32c26.tar.gz | |
Resolve "npm list errors for gitlab-svgs and node-pre-gyp"
| -rw-r--r-- | config/dependency_decisions.yml | 4 | ||||
| -rw-r--r-- | doc/development/fe_guide/icons.md | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 3af7f7bd5c0..4004e4d767d 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -459,9 +459,9 @@ :versions: [] :when: 2017-09-13 17:31:16.425819400 Z - - :approve - - gitlab-svgs + - "@gitlab-org/gitlab-svgs" - :who: Tim Zallmann - :why: Our own library - https://gitlab.com/gitlab-org/gitlab-svgs + :why: Our own library - GitLab License https://gitlab.com/gitlab-org/gitlab-svgs :versions: [] :when: 2017-09-19 14:36:32.795496000 Z - - :license diff --git a/doc/development/fe_guide/icons.md b/doc/development/fe_guide/icons.md index a76e978bd26..cef62618a3c 100644 --- a/doc/development/fe_guide/icons.md +++ b/doc/development/fe_guide/icons.md @@ -29,7 +29,7 @@ Please use the following function inside JS to render an icon : All Icons and Illustrations are managed in the [gitlab-svgs](https://gitlab.com/gitlab-org/gitlab-svgs) repository which is added as a dev-dependency. -To upgrade to a new SVG Sprite version run `yarn upgrade https://gitlab.com/gitlab-org/gitlab-svgs` and then run `yarn run svg`. This task will copy the svg sprite and all illustrations in the correct folders. +To upgrade to a new SVG Sprite version run `yarn upgrade @gitlab-org/gitlab-svgs` and then run `yarn run svg`. This task will copy the svg sprite and all illustrations in the correct folders. # SVG Illustrations diff --git a/package.json b/package.json index e607981143d..cbcce40ffb9 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "webpack-stats-plugin": "^0.1.5" }, "devDependencies": { + "@gitlab-org/gitlab-svgs": "^1.0.2", "babel-plugin-istanbul": "^4.0.0", "eslint": "^3.10.1", "eslint-config-airbnb-base": "^10.0.1", @@ -82,7 +83,6 @@ "eslint-plugin-import": "^2.2.0", "eslint-plugin-jasmine": "^2.1.0", "eslint-plugin-promise": "^3.5.0", - "gitlab-svgs": "https://gitlab.com/gitlab-org/gitlab-svgs.git", "istanbul": "^0.4.5", "jasmine-core": "^2.6.3", "jasmine-jquery": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index bf92370d44f..1271c8a1ee3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,10 @@ # yarn lockfile v1 +"@gitlab-org/gitlab-svgs@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.0.2.tgz#e4d29058e2bb438ba71ac525c6397ef15ae2877b" + abbrev@1, abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" @@ -2720,10 +2724,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -"gitlab-svgs@https://gitlab.com/gitlab-org/gitlab-svgs.git": - version "1.0.4" - resolved "https://gitlab.com/gitlab-org/gitlab-svgs.git#0442503549e6d74a4e22e1641e1d2ab0ae09884b" - glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" |