diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-07 17:41:21 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-07 17:41:21 +0000 |
| commit | 40b17bdebd429c3d9693644404be8f56ff3ac441 (patch) | |
| tree | 85f7b2caaee28f04c68fd1b5edb263c4147cffee | |
| parent | c3ce61ba41c58bcbb9120acc08538330a64ec334 (diff) | |
| parent | 629b4e68e8f9f46ff81fabc2f439264e681dabcc (diff) | |
| download | gitlab-ce-40b17bdebd429c3d9693644404be8f56ff3ac441.tar.gz | |
Merge branch 'add-license-finder-to-contributing' into 'master'
Add License Finder information to contribution acceptance criteria.
To make it clear what should be done when the license finder test fails.
cc: @stanhu
See merge request !4512
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 18270d9598f..f4472214778 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -405,6 +405,7 @@ description area. Copy-paste it to retain the markdown format. entire line to follow it. This prevents linting tools from generating warnings. - Don't touch neighbouring lines. As an exception, automatic mass refactoring modifications may leave style non-compliant. +1. If the merge request adds any new libraries (gems, JavaScript libraries, etc.), they should conform to our [Licensing guidelines][license-finder-doc]. See the instructions in that document for help if your MR fails the "license-finder" test with a "Dependencies that need approval" error. ## Changes for Stable Releases @@ -531,3 +532,4 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor [gitlab-design]: https://gitlab.com/gitlab-org/gitlab-design [free Antetype viewer (Mac OSX only)]: https://itunes.apple.com/us/app/antetype-viewer/id824152298?mt=12 [`gitlab8.atype` file]: https://gitlab.com/gitlab-org/gitlab-design/tree/master/current/ +[license-finder-doc]: doc/development/licensing.md |