diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2016-06-05 06:32:59 +0300 |
---|---|---|
committer | Connor Shea <connor.james.shea@gmail.com> | 2016-06-06 22:39:36 +0300 |
commit | b2e85b796835b024d9436aae43b3a7c65fab66de (patch) | |
tree | 32a4274441eb054209e4fdc7413a4b6959e00331 /doc/development | |
parent | 7045b9e908a6ea4f76b5e6ae09c5ab1385685c5a (diff) |
Add relevant commands to the licensing document, resolve some feedback.
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/README.md | 1 | ||||
-rw-r--r-- | doc/development/licensing.md | 36 |
2 files changed, 34 insertions, 3 deletions
diff --git a/doc/development/README.md b/doc/development/README.md index cf1bd493a9f..c5d5af43864 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -11,7 +11,6 @@ - [Migration Style Guide](migration_style_guide.md) for creating safe migrations - [Performance guidelines](performance.md) - [Rake tasks](rake_tasks.md) for development -- [SCSS Style Guide](scss_styleguide.md) - [Shell commands](shell_commands.md) in the GitLab codebase - [Sidekiq debugging](sidekiq_debugging.md) - [SQL guidelines](sql.md) for SQL guidelines diff --git a/doc/development/licensing.md b/doc/development/licensing.md index abfd9926522..8c8c7486fff 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -8,7 +8,39 @@ In order to comply with the terms the libraries we use are licensed under, we ha 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. -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. [License Finder's README][license_finder] includes information and guidance on manually adding a gem's license. Make sure to include a link to the library's license in the "why" section. +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. + +### License Finder commands + +There are a few basic commands License Finder provides that you'll need in order to manage license detection. + +To verify that the checks are passing, and/or to see what dependencies are causing the checks to fail: + +``` +bundle exec license_finder +``` + +To whitelist a new license: + +``` +license_finder whitelist add MIT +``` + +To blacklist a new license: + +``` +license_finder blacklist add GPLv2 +``` + +To tell License Finder about a dependency's license if it isn't auto-detected: + +``` +license_finder licenses add my_unknown_dependency MIT +``` + +For all of the above, please include `--why "Reason"` and `--who "My Name"` so the `decisions.yml` file can keep track of when, why, and who approved of a dependency. + +More detailed information on how the gem and its commands work is available in the [License Finder README][license_finder]. ## Acceptable Licenses @@ -25,7 +57,7 @@ Libraries with the following licenses are acceptable for use: ## Unacceptable Licenses -Libraries with the following licenses are acceptable for use: +Libraries with the following licenses are unacceptable for use: - [GNU GPL][GPL] (version 1, [version 2][GPLv2], [version 3][GPLv3], or any future versions): GPL-licensed libraries cannot be linked to from non-GPL projects. - [GNU AGPLv3][AGPLv3]: AGPL-licensed libraries cannot be linked to from non-GPL projects. |