diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-05 17:49:49 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-05 17:49:49 +0100 |
| commit | aaf16997303a470809c8be442a537983b49f0f7d (patch) | |
| tree | 388cdebfa8d95f19f86dc23754121a9bbe76e301 /PROCESS.md | |
| parent | 003a816afa885d56aa1eb4aadbad2b13b1baa25b (diff) | |
| download | gitlab-ce-aaf16997303a470809c8be442a537983b49f0f7d.tar.gz | |
Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/PROCESS.md b/PROCESS.md index 7c8db689256..758e773ae4d 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -130,7 +130,8 @@ freeze date (the 7th) should have a corresponding Enterprise Edition merge request, even if there are no conflicts. This is to reduce the size of the subsequent EE merge, as we often merge a lot to CE on the release date. For more information, see -[limit conflicts with EE when developing on CE][limit_ee_conflicts]. +[Automatic CE->EE merge][automatic_ce_ee_merge] and +[Guidelines for implementing Enterprise Edition feature][ee_features]. ### After the 7th @@ -281,4 +282,5 @@ still an issue I encourage you to open it on the [GitLab.com issue tracker](http ["Implement design & UI elements" guidelines]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#implement-design-ui-elements [Thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review [done]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#definition-of-done -[limit_ee_conflicts]: https://docs.gitlab.com/ce/development/limit_ee_conflicts.html +[automatic_ce_ee_merge]: https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html +[ee_features]: https://docs.gitlab.com/ce/development/ee_features.html |