summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-10 08:32:52 +0000
committerRémy Coutable <remy@rymai.me>2017-07-10 08:32:52 +0000
commitf074a959e76c5bd2e051f01e0c800a2d23f0e88d (patch)
tree327d1b5c93b22d63dbf0a0cf858e51a21c61c003
parent8906bbae3898484974fa3a37a7f5133acd5fad80 (diff)
parent6bd83a7b225c258c33b1be8c8d9a32e0c581ee8d (diff)
downloadgitlab-ce-f074a959e76c5bd2e051f01e0c800a2d23f0e88d.tar.gz
Merge branch 'patch-24' into 'master'
Fix gitlab-ee reference in ee_compat_check See merge request !12713
-rw-r--r--lib/gitlab/ee_compat_check.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 1a5887dab7e..edd7795eef0 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -337,7 +337,7 @@ module Gitlab
# In the EE repo
$ git push origin #{ee_branch_prefix}
- ⚠️ Also, don't forget to create a new merge request on gitlab-ce and
+ ⚠️ Also, don't forget to create a new merge request on gitlab-ee and
cross-link it with the CE merge request.
Once this is done, you can retry this failed build, and it should pass.