summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-18 15:06:25 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-18 15:06:25 +0000
commitdf17c4dc2d2a1308ce3fe1eb9c4b60bb27867602 (patch)
treefb84533b00dcdb307341519a25c9c4a91af042a3
parent4733570c3d710f3124718fa1173f3068eb932281 (diff)
parenta5cc1c261371b501791fc250801503f64b47fb90 (diff)
downloadgitlab-ce-df17c4dc2d2a1308ce3fe1eb9c4b60bb27867602.tar.gz
Merge branch '39237-fix-ee_compat_check' into 'master'
Improve the gitlab:dev:ee_compat_check task to pass a repo URL without credentials Closes #39237 See merge request gitlab-org/gitlab-ce!14934
-rw-r--r--lib/tasks/gitlab/dev.rake4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/dev.rake b/lib/tasks/gitlab/dev.rake
index b4d05f5995a..930b4bc13e2 100644
--- a/lib/tasks/gitlab/dev.rake
+++ b/lib/tasks/gitlab/dev.rake
@@ -5,7 +5,9 @@ namespace :gitlab do
opts =
if ENV['CI']
{
- ce_repo: ENV['CI_REPOSITORY_URL'],
+ # We don't use CI_REPOSITORY_URL since it includes `gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@`
+ # which is confusing in the steps suggested in the job's output.
+ ce_repo: "#{ENV['CI_PROJECT_URL']}.git",
branch: ENV['CI_COMMIT_REF_NAME']
}
else