diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-15 05:57:05 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-15 05:57:05 +0000 |
| commit | c27a73b506a201830cc58b212b9c04be30f85f9b (patch) | |
| tree | c25b5011cc86a089c095f3effe03c9c70ff20777 | |
| parent | 83f2ccba8bf6a7cb55bacc84a62a70cca676634e (diff) | |
| parent | d65fca3333c4ed1e8b600789372ec483ae45ced5 (diff) | |
| download | gitlab-ce-c27a73b506a201830cc58b212b9c04be30f85f9b.tar.gz | |
Merge branch '38007-update-licensing-docs' into 'master'
Update licensing docs to clarify process for node modules
Closes #38007
See merge request gitlab-org/gitlab-ce!14575
| -rw-r--r-- | doc/development/licensing.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 902b1c74a42..274923c2d43 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -4,11 +4,11 @@ GitLab CE is licensed under the terms of the MIT License. GitLab EE is licensed ## Automated Testing -In order to comply with the terms the libraries we use are licensed under, we have to make sure to check new gems for compatible licenses whenever they're added. To automate this process, we use the [license_finder][license_finder] gem by Pivotal. It runs every time a new commit is pushed and verifies that all gems in the bundle use a license that doesn't conflict with the licensing of either GitLab Community Edition or GitLab Enterprise Edition. +In order to comply with the terms the libraries we use are licensed under, we have to make sure to check new gems for compatible licenses whenever they're added. To automate this process, we use the [license_finder][license_finder] gem by Pivotal. It runs every time a new commit is pushed and verifies that all gems and node modules in the bundle use a license that doesn't conflict with the licensing of either GitLab Community Edition or GitLab Enterprise Edition. -There are some limitations with the automated testing, however. CSS and JavaScript libraries, as well as any Ruby libraries not included by way of Bundler, must be verified manually and independently. Take care whenever one such library is used, as automated tests won't catch problematic licenses from them. +There are some limitations with the automated testing, however. CSS, JavaScript, or Ruby libraries which are not included by way of Bundler, NPM, or Yarn (for instance those manually copied into our source tree in the `vendor` directory), must be verified manually and independently. Take care whenever one such library is used, as automated tests won't catch problematic licenses from them. -Some gems may not include their license information in their `gemspec` file. These won't be detected by License Finder, and will have to be verified manually. +Some gems may not include their license information in their `gemspec` file, and some node modules may not include their license information in their `package.json` file. These won't be detected by License Finder, and will have to be verified manually. ### License Finder commands |