diff options
| author | Jose Vargas <jvargas@gitlab.com> | 2018-10-30 16:54:55 -0600 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-11-01 13:37:32 -0600 |
| commit | 18abb2de76b34652c6cd9587b48be5f4a775b224 (patch) | |
| tree | 78154b581059419980ed4235b04d8c41ab7d8e93 | |
| parent | 0f62aeb405f7d5526b2403a97cbce77eb4e19b6b (diff) | |
| download | gitlab-ce-docs-jivl-add-mpl-to-licenses.tar.gz | |
Adds dompurify license to the list of approved licensesdocs-jivl-add-mpl-to-licenses
| -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 62760ffee3a..689f0808e03 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -599,3 +599,9 @@ in compiled/distributed product so attribution not needed. :versions: [] :when: 2018-10-02 19:23:54.840151000 Z +- - :approve + - dompurify + - :who: Jose Vargas + :why: https://github.com/cure53/DOMPurify/blob/master/LICENSE + :versions: [] + :when: 2018-10-30 22:54:31.519639000 Z diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 0e71cd47481..a97c91431be 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -57,6 +57,7 @@ Libraries with the following licenses are acceptable for use: - [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. - [OWFa 1.0][OWFa1]: An open-source license and patent grant designed for specifications. +- [DomPurify License][DomPurify]: Dual-licensed under either the Apache 2.0 License or the Mozilla Public License Version 2.0, defer to the Apache 2-0 License. ## Unacceptable Licenses @@ -120,6 +121,7 @@ Dependencies which are only used in development or test environment are exempt f [GPLv2]: http://www.gnu.org/licenses/gpl-2.0.txt [GPLv3]: http://www.gnu.org/licenses/gpl-3.0.txt [AGPLv3]: http://choosealicense.com/licenses/agpl-3.0/ +[DomPurify]: https://github.com/cure53/DOMPurify/blob/master/LICENSE [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 |