diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-08-20 07:54:29 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-08-20 07:54:29 +0000 |
| commit | 883d5fcbc8acc4943fa7e77866530aa5ae5925e8 (patch) | |
| tree | c93795774ede420f5197e408152eac36c4c25234 /doc | |
| parent | 63ab3cf44376c1672c3af1940ff52f8bb88590e7 (diff) | |
| parent | f3184b226872b008158fbe3ad832c14e34dc67bc (diff) | |
| download | gitlab-ce-883d5fcbc8acc4943fa7e77866530aa5ae5925e8.tar.gz | |
Merge branch 'chore/fix-typo' into 'master'
Fix minor typo: CE -> EE
See merge request gitlab-org/gitlab-ce!31952
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/automatic_ce_ee_merge.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index 98b8a48abf4..001a92790e1 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -200,7 +200,7 @@ code. ### Why merge automatically? As we work towards continuous deployments and a single repository for both CE -and EE, we need to first make sure that all CE changes make their way into CE as +and EE, we need to first make sure that all CE changes make their way into EE as fast as possible. Past experiences and data have shown that periodic CE to EE merge requests do not scale, and often take a very long time to complete. For example, [in this |