Skip to content

Add JH to License File

Jerome Z Ng requested to merge jeromezng-master-patch-04742 into master

What does this MR do?

This is a follow up to the blog post announcement https://about.gitlab.com/blog/2021/03/18/gitlab-licensed-technology-to-new-independent-chinese-company/ where we announced that there will be three distributions of the GitLab product: CE (Community Edition), EE (Enterprise Edition), and JH (JiHu Edition).

This MR updates the LICENSE file to state all code under the "jh/" directory will be licensed under the "jh/LICENSE". In addition to this, it updates README file with a link to the JiHu Edition.

The JH licensing structure is setup similar to our EE licensing structure where the LICENSE file sits at the root of the https://gitlab.com/gitlab-org/gitlab with the proprietary license files and code sitting in their respect /ee or /jh directories.

The JH license file will be added directly into the https://gitlab.com/gitlab-jh/gitlab project under issue https://gitlab.com/gitlab-jh/gitlab/-/issues/92

For more information on how changes in gitlab-org-gitlab are downstreamed to gitlab-jh/gitlab, please see https://about.gitlab.com/handbook/ceo/chief-of-staff-team/jihu-support/#merge-request-process

Screenshots (strongly suggested)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Jerome Z Ng

Merge request reports

Loading