diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-06-06 01:33:27 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-06-06 01:33:27 +0000 |
| commit | 262a1ca14f1494c1ff2f7aab0d1c7e22b4044eb2 (patch) | |
| tree | 3fda81f4cfdaabcd1e3597126f41ffe8fde8ec01 /doc | |
| parent | e6a88b024fa7f8e1ec5b712744d0e0d118b026e6 (diff) | |
| parent | cdf9c861f4cd4d18f449735c35105b31813e0798 (diff) | |
| download | gitlab-ce-262a1ca14f1494c1ff2f7aab0d1c7e22b4044eb2.tar.gz | |
Merge branch 'docs-request-approval-for-licenses' into 'master'
Update docs on how to request approval for licenses/IP
See merge request gitlab-org/gitlab-ce!28535
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/licensing.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/development/licensing.md b/doc/development/licensing.md index 0e71cd47481..0db90d2872f 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 and listed on the [Acceptable Licenses][Acceptable-Licenses] list 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 or not it will be modified, 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 |