diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-04 14:32:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-04 14:32:25 +0000 |
| commit | 597bc29260c4be3a1527a1c5307bec40004bac4d (patch) | |
| tree | 87bd43ea1c6d808c5bc057ba812936d413cee001 | |
| parent | d47a00c35706b70b89a39092861bd40e731cf5c9 (diff) | |
| parent | 9f48181885d2e276aa237c48a99f05601460d01e (diff) | |
| download | gitlab-ce-597bc29260c4be3a1527a1c5307bec40004bac4d.tar.gz | |
Merge branch 'forbid-fb-bsd-patents' into 'master'
Add Facebook BSD+PATENTS license to the "unacceptable" list
See merge request !14029
| -rw-r--r-- | config/dependency_decisions.yml | 6 | ||||
| -rw-r--r-- | doc/development/licensing.md | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index c9018f3bf0e..d6c3c84851b 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -410,3 +410,9 @@ :why: https://gitlab.com/gitlab-com/organization/issues/116 :versions: [] :when: 2017-09-01 17:17:51.996511844 Z +- - :blacklist + - Facebook BSD+PATENTS + - :who: Nick Thomas <nick@gitlab.com> + :why: https://gitlab.com/gitlab-com/organization/issues/117 + :versions: [] + :when: 2017-09-04 12:59:51.150798717 Z 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 |