diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-04 08:26:24 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-04 08:26:24 +0000 |
| commit | 34ef6dc147b413b1f2f8faf2f26c9e1327830874 (patch) | |
| tree | ee8198c153b9913cf8855ed5147ced0b3b38ece4 | |
| parent | 1f59564fbf7b48350b43cc3e1659c33c92759151 (diff) | |
| parent | 3699362e9fe2dc67247f9ea9c1b74816054b2a74 (diff) | |
| download | gitlab-ce-34ef6dc147b413b1f2f8faf2f26c9e1327830874.tar.gz | |
Merge branch 'approve-unlicense' into 'master'
Approve the Unlicense
See merge request !14001
| -rw-r--r-- | config/dependency_decisions.yml | 6 | ||||
| -rw-r--r-- | doc/development/licensing.md | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index ca5b941aebf..c9018f3bf0e 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -404,3 +404,9 @@ :why: https://github.com/mafintosh/thunky/blob/master/README.md#license :versions: [] :when: 2017-08-07 05:56:09.907045000 Z +- - :whitelist + - Unlicense + - :who: Nick Thomas <nick@gitlab.com> + :why: https://gitlab.com/gitlab-com/organization/issues/116 + :versions: [] + :when: 2017-09-01 17:17:51.996511844 Z diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 2b16dfe0e7c..60da7b9166d 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -55,6 +55,7 @@ Libraries with the following licenses are acceptable for use: - [BSD 3-Clause License][BSD-3-Clause] (also known as New BSD or Modified BSD): A permissive (non-copyleft) license as defined by the Open Source Initiative - [ISC License][ISC] (also known as the OpenBSD License): A permissive (non-copyleft) license as defined by the Open Source Initiative. - [Creative Commons Zero (CC0)][CC0]: A public domain dedication, recommended as a way to disclaim copyright on your work to the maximum extent possible. +- [Unlicense][UNLICENSE]: Another public domain dedication. ## Unacceptable Licenses @@ -101,5 +102,6 @@ Gems which are included only in the "development" or "test" groups by Bundler ar [OSL]: https://opensource.org/licenses/OSL-3.0 [OSL-GNU]: https://www.gnu.org/licenses/license-list.en.html#OSL [Org-Repo]: https://gitlab.com/gitlab-com/organization +[UNLICENSE]: https://unlicense.org [Acceptable-Licenses]: #acceptable-licenses [Unacceptable-Licenses]: #unacceptable-licenses |