From aebd1dc28542987070a56e9caf0e5315738b1f75 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 25 Apr 2017 20:42:07 +0200
Subject: [PATCH 1/2] Bring back EE conflicts guidelines to dev onboarding
---
source/handbook/developer-onboarding/index.html.md | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/source/handbook/developer-onboarding/index.html.md b/source/handbook/developer-onboarding/index.html.md
index 3345f120d6e..fceb0971f69 100644
--- a/source/handbook/developer-onboarding/index.html.md
+++ b/source/handbook/developer-onboarding/index.html.md
@@ -96,7 +96,17 @@ volunteer contributors.
### 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
--
GitLab
From 7a8eb08f42e0e362c9515366aedf1332404a0f13 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 25 Apr 2017 20:50:20 +0200
Subject: [PATCH 2/2] Move EE development details to dev onboarding page
---
data/projects.yml | 12 +++---------
source/handbook/developer-onboarding/index.html.md | 12 ++++++++++++
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/data/projects.yml b/data/projects.yml
index 99478a87c08..d462edbe2a5 100644
--- a/data/projects.yml
+++ b/data/projects.yml
@@ -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
diff --git a/source/handbook/developer-onboarding/index.html.md b/source/handbook/developer-onboarding/index.html.md
index fceb0971f69..33c0f197d60 100644
--- a/source/handbook/developer-onboarding/index.html.md
+++ b/source/handbook/developer-onboarding/index.html.md
@@ -94,6 +94,18 @@ 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
GitLab Community Edition is merged daily to GitLab Enterprise Edition (look for
--
GitLab