diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-26 15:18:18 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-26 15:18:18 +0000 |
| commit | 9f79f845f7e9a7855f3ab359cf6dcf2daf8b8e71 (patch) | |
| tree | e12242b9b441bb78fd1ebe0c24c11cd50a5cd45f /doc | |
| parent | 6d1498ab4e80a73931f48d60c1604b9ff3617367 (diff) | |
| parent | c5e6e45f11cd898ec1ff239b974278c0e4ecaa1c (diff) | |
| download | gitlab-ce-9f79f845f7e9a7855f3ab359cf6dcf2daf8b8e71.tar.gz | |
Merge branch 'doc-license-wtfpl-rejected' into 'master'
WTFPL is deemed unacceptable
[ci skip]
See merge request gitlab-org/gitlab-ce!14485
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 9a5811d8474..a75cdf22f40 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -65,6 +65,7 @@ Libraries with the following licenses are unacceptable for use: - [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. +- [WTFPL][WTFPL]: is a public domain dedication [rejected by the OSI (3.2)][WTFPL-OSI]. Also has a strong language which is not in accordance with our diversity policy. ## Requesting Approval for Licenses @@ -108,3 +109,5 @@ Gems which are included only in the "development" or "test" groups by Bundler ar [x-list]: https://www.apache.org/legal/resolved.html#category-x [Acceptable-Licenses]: #acceptable-licenses [Unacceptable-Licenses]: #unacceptable-licenses +[WTFPL]: https://wtfpl.net +[WTFPL-OSI]: https://opensource.org/minutes20090304 |