summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-09-03 07:46:33 +0000
committerPhil Hughes <me@iamphill.com>2018-09-03 07:46:33 +0000
commite550b1abaaa9b0053d3430377938f1e801c1fbb1 (patch)
tree4790ebdb4d938a2043ee73d2fc73b812a36ddbf0
parentf7f1c394fc15101c5467f0fd526c831c832e14f3 (diff)
parentd11cfcf777b33cf565f9c089b819add14b76d162 (diff)
downloadgitlab-ce-e550b1abaaa9b0053d3430377938f1e801c1fbb1.tar.gz
Merge branch 'winh-ignore-npm-devdependencies' into 'master'
Exclude frontend development dependencies from license restrictions See merge request gitlab-org/gitlab-ce!21430
-rw-r--r--config/dependency_decisions.yml7
-rw-r--r--doc/development/licensing.md2
2 files changed, 8 insertions, 1 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index dce1fc1bc45..16f16f77fb9 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -570,3 +570,10 @@
:why: https://github.com/codesandbox-app/codesandbox-importers/blob/master/packages/import-utils/LICENSE
:versions: []
:when: 2018-08-03 12:23:24.083046000 Z
+- - :ignore_group
+ - devDependencies
+ - :who: Winnie Hellmann
+ :why: NPM packages used for development are not distributed with the final product and are therefore
+ exempt.
+ :versions: []
+ :when: 2018-08-30 12:06:35.668181000 Z
diff --git a/doc/development/licensing.md b/doc/development/licensing.md
index ddaf636a742..0e71cd47481 100644
--- a/doc/development/licensing.md
+++ b/doc/development/licensing.md
@@ -100,7 +100,7 @@ If a gem uses a license which is not listed above, open an issue and ask. If a l
Keep in mind that each license has its own restrictions (typically defined in their body text). Please make sure to comply with those restrictions at all times whenever an external library is used.
-Gems which are included only in the "development" or "test" groups by Bundler are exempt from license requirements, as they're not distributed for use in production.
+Dependencies which are only used in development or test environment are exempt from license requirements, as they're not distributed for use in production.
**NOTE:** This document is **not** legal advice, nor is it comprehensive. It should not be taken as such.