Skip to content
Snippets Groups Projects
Commit 35ee68cb authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'fix/gb/fix-handbook-links-to-gitlab-ee' into 'master'

Improve handbook sections related to GitLab EE development

See merge request !5794
parents 763a0ed4 7a8eb08f
No related branches found
No related tags found
1 merge request!5794Improve handbook sections related to GitLab EE development
Pipeline #
Loading
Loading
@@ -19,15 +19,9 @@ gitlab-ee:
This is _not_ an open source project, but we made the source code available for
viewing and contributions.
 
GitLab Community Edition is merged daily to GitLab Enterprise Edition (look for
the `CE Upstream` merge requests) and as a developer it's your responsibility
to ensure that your merge requests apply cleanly to GitLab EE.
GitLab EE requires a license key to be used. To be able to run your
own instances for development you can use one of the shared licenses
(like https://license.gitlab.com/licenses/1449) or you can clone
https://dev.gitlab.org/gitlab/license-app and generate your own
licenses.
GitLab Community Edition is merged daily to GitLab Enterprise Edition.
GitLab EE requires a license key to be used.
 
gitlab-shell:
name: GitLab Shell
Loading
Loading
Loading
Loading
@@ -94,9 +94,31 @@ volunteer contributors.
 
[changelog-script]: https://docs.gitlab.com/ce/development/changelog.html
 
### Working on GitLab EE
GitLab EE requires a license key to be used.
To be able to run your own instances for development you can use one of the
shared licenses, like [https://license.gitlab.com/licenses/1449](https://license.gitlab.com/licenses/1449)
or you can clone [license-app][license-app] and generate your own licenses.
[License-app][license-app] is available only for GitLab employees.
[license-app]: /handbook/engineering/projects/#license-app
### Ensure that your changes apply cleanly to GitLab EE
 
Please see [GitLab Enterprise Edition (EE)](#gitlab-enterprise-edition-ee).
GitLab Community Edition is merged daily to GitLab Enterprise Edition (look for
the [`CE Upstream` merge requests]) and as a developer it's your responsibility
to ensure that your merge requests [apply cleanly to GitLab EE][ce-ee-docs].
Please consult [Limit conflicts with EE when developing on CE][ce-ee-docs] for
more details.
Please see [GitLab Enterprise Edition (EE)][gitlab-ee].
[`CE Upstream` merge requests]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=CE+upstream
[ce-ee-docs]: https://docs.gitlab.com/ee/development/limit_ee_conflicts.html
[gitlab-ee]: /handbook/engineering/projects/#gitlab-ee
 
### Ruby Gems
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment