diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-01 11:58:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-11-01 11:58:01 +0000 |
| commit | b974e89f3652abae556b1e8c50615b5039658616 (patch) | |
| tree | 698466860c703df7cd95cb1a9cf87ec3d585f8d4 | |
| parent | a5b4fa3533dffca6662b0c5f368f1d76ee4c509f (diff) | |
| parent | a612daf17763979fc840f0fa247ab082973fbd4f (diff) | |
| download | gitlab-ce-b974e89f3652abae556b1e8c50615b5039658616.tar.gz | |
Merge branch 'blacklist-osl' into 'master'
Blacklist the OSL 3.0 license
See merge request !7171
| -rw-r--r-- | config/dependency_decisions.yml | 7 | ||||
| -rw-r--r-- | doc/development/licensing.md | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 74325872b09..c11296975b7 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -101,6 +101,13 @@ :why: GPL-licensed libraries cannot be linked to from non-GPL projects. :versions: [] :when: 2016-05-02 05:29:43.904715000 Z +- - :blacklist + - OSL-3.0 + - :who: Sean McGivern + :why: The OSL license is a copyleft license + :versions: [] + :when: 2016-10-28 11:02:15.540105000 Z + # GEM LICENSES - - :license 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 |