diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-10 09:09:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-10 09:09:29 +0000 |
| commit | 921173681c207356914a35ea3dca1afffeac8b05 (patch) | |
| tree | 45f0b49531b549dd7e28dd22744f822a214390a4 /app/models | |
| parent | e0df70a614e6381d1ccb9547f23c797063ba6dfc (diff) | |
| download | gitlab-ce-921173681c207356914a35ea3dca1afffeac8b05.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 7f61b83def5..d960732b16f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2026,10 +2026,10 @@ class Project < ApplicationRecord Gitlab::Ci::Variables::Collection.new.tap do |variables| break variables unless Gitlab.config.dependency_proxy.enabled - variables.append(key: 'CI_DEPENDENCY_PROXY_SERVER', value: "#{Gitlab.config.gitlab.host}:#{Gitlab.config.gitlab.port}") + variables.append(key: 'CI_DEPENDENCY_PROXY_SERVER', value: Gitlab.host_with_port) variables.append( key: 'CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX', - value: "#{Gitlab.config.gitlab.host}:#{Gitlab.config.gitlab.port}/#{namespace.root_ancestor.path}#{DependencyProxy::URL_SUFFIX}" + value: "#{Gitlab.host_with_port}/#{namespace.root_ancestor.path}#{DependencyProxy::URL_SUFFIX}" ) end end |