diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-08 19:09:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-08 19:09:57 +0000 |
| commit | 806a68a81f1baeed07c146b1b5d9eb77796c46ba (patch) | |
| tree | 2c4ec9b466c2e272e2b0b01a001400fb8e5a338e /lib/gitlab | |
| parent | 2a181d68c810e89ff5d2e49999775d8b58adb394 (diff) | |
| parent | cd03bf847d0edff179317818e95efb4551dabecf (diff) | |
| download | gitlab-ce-806a68a81f1baeed07c146b1b5d9eb77796c46ba.tar.gz | |
Merge branch 'docs/improve-limit-conflicts-with-ee' into 'master'
Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"
See merge request gitlab-org/gitlab-ce!15749
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 4a9d3e52fae..37face8e7d0 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -280,7 +280,7 @@ module Gitlab The `#{branch}` branch applies cleanly to EE/master! Much ❤️! For more information, see - https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests + https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html #{THANKS_FOR_READING_BANNER} } end @@ -357,7 +357,7 @@ module Gitlab Once this is done, you can retry this failed build, and it should pass. Stay 💪 ! For more information, see - https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests + https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html #{THANKS_FOR_READING_BANNER} } end @@ -378,7 +378,7 @@ module Gitlab retry this build. Stay 💪 ! For more information, see - https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests + https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html #{THANKS_FOR_READING_BANNER} } end |