diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-06-07 11:23:26 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-06-07 11:23:26 -0600 |
| commit | 629b4e68e8f9f46ff81fabc2f439264e681dabcc (patch) | |
| tree | 5f6cb830a16f3e17c5830e5baaca4ba55e3936ff /CONTRIBUTING.md | |
| parent | 7d315aecfbd807bcdb9131151e86e37c90603f70 (diff) | |
| download | gitlab-ce-629b4e68e8f9f46ff81fabc2f439264e681dabcc.tar.gz | |
Add License Finder information to contribution acceptance criteria.
Diffstat (limited to 'CONTRIBUTING.md')
| -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 |