summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-11-16 20:47:07 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-11-16 20:47:07 +0000
commit50e6cc11f8f4f535d8c012661695db595a7cc513 (patch)
treefa28db52ff1bf3b88ee1550b80de07209828364b
parentac13e0fc3fd0caca8793b3eedab115d8d8de862e (diff)
parentdf4a3241f98674cb8f719613fd5118262b8939d6 (diff)
downloadgitlab-ce-50e6cc11f8f4f535d8c012661695db595a7cc513.tar.gz
Merge branch 'remove-unneeded-license-refs' into 'master'
Remove unneeded licenses for gitlab-org npm namsepace See merge request gitlab-org/gitlab-ce!23155
-rw-r--r--config/dependency_decisions.yml7
-rw-r--r--vendor/licenses.csv3
2 files changed, 1 insertions, 9 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 488728e26ab..84d47bd52ad 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -544,13 +544,6 @@
:why: https://github.com/xtuc/webassemblyjs/blob/master/LICENSE
:versions: []
:when: 2018-06-08 05:30:56.764116000 Z
-- - :license
- - "@gitlab-org/gitlab-ui"
- - MIT
- - :who: Clement Ho
- :why: Our own library
- :versions: []
- :when: 2018-07-17 21:02:54.529227000 Z
- - :approve
- lz-string
- :who: Phil Hughes
diff --git a/vendor/licenses.csv b/vendor/licenses.csv
index ea3d3fd02f9..f6fd1efaa83 100644
--- a/vendor/licenses.csv
+++ b/vendor/licenses.csv
@@ -67,9 +67,8 @@
@babel/template,7.1.2,MIT
@babel/traverse,7.1.0,MIT
@babel/types,7.1.2,MIT
-@gitlab-org/gitlab-svgs,1.32.0,MIT
-@gitlab-org/gitlab-ui,1.10.0,MIT
@gitlab/svgs,1.35.0,MIT
+@gitlab/ui,1.11.0,MIT
@sindresorhus/is,0.7.0,MIT
@types/jquery,2.0.48,MIT
@vue/component-compiler-utils,2.2.0,MIT