diff options
author | Nick Thomas <nick@gitlab.com> | 2017-09-04 13:58:17 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-09-04 14:00:59 +0100 |
commit | 9f48181885d2e276aa237c48a99f05601460d01e (patch) | |
tree | bf14ad94fd057fb1d0ca3763699a97192d1fb8e2 /doc | |
parent | a0c13698f948d4ebc69ce54660c4022a4a394a0c (diff) | |
download | gitlab-ce-9f48181885d2e276aa237c48a99f05601460d01e.tar.gz |
Add Facebook BSD+PATENTS license to the "unacceptable" list
Diffstat (limited to 'doc')
-rw-r--r-- | doc/development/licensing.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 60da7b9166d..9a5811d8474 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -64,6 +64,7 @@ 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. - [Open Software License (OSL)][OSL]: is a copyleft license. In addition, the FSF [recommend against its use][OSL-GNU]. +- [Facebook BSD + PATENTS][Facebook]: is a 3-clause BSD license with a patent grant that has been deemed [Category X][x-list] by the Apache foundation. ## Requesting Approval for Licenses @@ -103,5 +104,7 @@ Gems which are included only in the "development" or "test" groups by Bundler ar [OSL-GNU]: https://www.gnu.org/licenses/license-list.en.html#OSL [Org-Repo]: https://gitlab.com/gitlab-com/organization [UNLICENSE]: https://unlicense.org +[Facebook]: https://code.facebook.com/pages/850928938376556 +[x-list]: https://www.apache.org/legal/resolved.html#category-x [Acceptable-Licenses]: #acceptable-licenses [Unacceptable-Licenses]: #unacceptable-licenses |