summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorKrasimir Angelov <kangelov@gitlab.com>2019-05-21 21:59:18 +1200
committerKrasimir Angelov <kangelov@gitlab.com>2019-05-21 21:59:18 +1200
commit397efed8e82da68e2138e48ac68836622198228e (patch)
treeed367e31e9a26346d223f05995d5ed9f3e44ec81 /doc/development
parent5ae293e33c4d6c8187543778717474a7aaccee1c (diff)
downloadgitlab-ce-397efed8e82da68e2138e48ac68836622198228e.tar.gz
Update docs on how to request approval for licenses/IP
Squashed commit of the following: commit c07a6a46aba640fe0980b603f6bcaac89dc6153b Author: Jamie Hurewitz <jhurewitz@gitlab.com> Date: Sun May 5 01:02:44 2019 +0000 Update licensing.md
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/licensing.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md
index 0e71cd47481..0550088ed5a 100644
--- a/doc/development/licensing.md
+++ b/doc/development/licensing.md
@@ -88,9 +88,11 @@ Definitions
GitLab means GitLab Inc. and its affiliates and subsidiaries.
-## Requesting Approval for Licenses
+## Requesting Approval for Licenses or any other Intellectual Property
-Libraries that are not listed in the [Acceptable Licenses][Acceptable-Licenses] or [Unacceptable Licenses][Unacceptable-Licenses] list can be submitted to the legal team for review. Please email `legal@gitlab.com` with the details. After a decision has been made, the original requestor is responsible for updating this document.
+Libraries that are not already approved on the [Acceptable Licenses][Acceptable-Licenses] or that may be listed on the [Unacceptable Licenses][Unacceptable-Licenses] list may be submitted to the legal team for review and use on a case by case basis. Please email `legal@gitlab.com` with the details of how the software will be used, whether it will be modified or not, and how it will be distributed (if at all). After a decision has been made, the original requestor is responsible for updating this document, if applicable. Not all approvals will be approved for universal use and may continue to remain on the Unacceptable License list.
+
+All inquiries relating to patents should be directed to the Legal team.
## Notes