diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-09-15 02:12:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-09-15 17:34:13 +0800 |
| commit | 8281865092a4d2c25bd036d2feff6a8499c320b0 (patch) | |
| tree | 24095b41e7a0733e0065b7f851a6f342e8b36065 | |
| parent | 6be736a7d24ca548778b1d6ff27fd9dcd3e4a7fa (diff) | |
| download | gitlab-ce-37713-enable-ee_compat_check-for-forks.tar.gz | |
Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forks
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index abd401224d8..c5a8ea12245 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -284,13 +284,18 @@ module Gitlab EE/master, and no `#{ee_branch_prefix}` or `#{ee_branch_suffix}` branch was found in the EE repository. + If you're a community contributor, don't worry, someone from + GitLab Inc. will take care of this, and you don't have to do anything. + If you're willing to help, and are ok to contribute to EE as well, + you're welcome to help. You could follow the instructions below. + #{conflicting_files_msg} We advise you to create a `#{ee_branch_prefix}` or `#{ee_branch_suffix}` branch that includes changes from `#{ce_branch}` but also specific changes than can be applied cleanly to EE/master. In some cases, the conflicts are trivial and you can ignore the warning from this job. As always, - use your best judgment! + use your best judgement! There are different ways to create such branch: |