summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-10-31 12:11:56 +0000
committerSean McGivern <sean@gitlab.com>2016-10-31 12:11:56 +0000
commita612daf17763979fc840f0fa247ab082973fbd4f (patch)
treeedb3946bee54aa273713b99b53ec47b0e2e757eb
parent41fa7108011bb25c33dec9e171536566e3453971 (diff)
downloadgitlab-ce-blacklist-osl.tar.gz
Add OSL to licensing docblacklist-osl
-rw-r--r--doc/development/licensing.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md
index 05972b33fdb..5d177eb26ee 100644
--- a/doc/development/licensing.md
+++ b/doc/development/licensing.md
@@ -62,6 +62,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].
## Notes
@@ -93,3 +94,5 @@ Gems which are included only in the "development" or "test" groups by Bundler ar
[AGPLv3]: http://choosealicense.com/licenses/agpl-3.0/
[GNU-GPL-FAQ]: http://www.gnu.org/licenses/gpl-faq.html#IfLibraryIsGPL
[OSI-GPL]: https://opensource.org/faq#linking-proprietary-code
+[OSL]: https://opensource.org/licenses/OSL-3.0
+[OSL-GNU]: https://www.gnu.org/licenses/license-list.en.html#OSL