Commit ecc1785b authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'osw-use-correct-project-name-for-dev' into 'master'

Use correct CE project name for org repo

Closes gitlab-ce#63525

See merge request gitlab-org/gitlab-ee!14310
parents 0e50e3ff bb5c72b8
......@@ -299,7 +299,15 @@ module EESpecificCheck
end
def ce_repo_url
@ce_repo_url ||= ENV.fetch('CI_REPOSITORY_URL', 'https://gitlab.com/gitlab-org/gitlab-ce.git').sub('gitlab-ee', 'gitlab-ce')
@ce_repo_url ||=
begin
repo_url = ENV.fetch('CI_REPOSITORY_URL', 'https://gitlab.com/gitlab-org/gitlab-ce.git')
# This workaround can be removed once we rename the dev CE project
# https://gitlab.com/gitlab-org/gitlab-ce/issues/59107
project_name = repo_url =~ /dev\.gitlab\.org/ ? 'gitlabhq' : 'gitlab-ce'
repo_url.sub('gitlab-ee', project_name)
end
end
def current_head
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment