summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-08-15 06:51:21 +0000
committerEvan Read <eread@gitlab.com>2019-08-15 06:51:21 +0000
commit115c4cee329402bcb02c66c986db18a58ccda64a (patch)
treee5fdcbce0c43618c6e3c88d1f1a29d778aede5bb /doc/development
parentb9f71bb1d752e78530bc948ae764c2864b16a099 (diff)
downloadgitlab-ce-115c4cee329402bcb02c66c986db18a58ccda64a.tar.gz
Add section on how we run CE->EE merge at GitLab
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/automatic_ce_ee_merge.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md
index 423b35a9e3a..98b8a48abf4 100644
--- a/doc/development/automatic_ce_ee_merge.md
+++ b/doc/development/automatic_ce_ee_merge.md
@@ -171,6 +171,19 @@ Now, every time you create an MR for CE and EE:
job failed, you are required to submit the EE MR so that you can fix the conflicts in EE
before merging your changes into CE.
+## How we run the Automatic CE->EE merge at GitLab
+
+At GitLab, we use the [Merge Train](https://gitlab.com/gitlab-org/merge-train)
+project to keep our [gitlab-ee](https://gitlab.com/gitlab-org/gitlab-ee)
+repository updated with commits from
+[gitlab-ce](https://gitlab.com/gitlab-org/gitlab-ce).
+
+We have a mirror of the [Merge Train](https://gitlab.com/gitlab-org/merge-train)
+project [configured](https://ops.gitlab.net/gitlab-org/merge-train) to run an
+automatic CE->EE merge job every twenty minutes as a scheduled CI job. The
+[configured](https://ops.gitlab.net/gitlab-org/merge-train) Merge Train project
+is only accessible to authorized GitLab staff.
+
## FAQ
### How does automatic merging work?