summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-12-20 10:54:07 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-01-03 14:18:05 +0100
commitfb998f2edf41684a4d3f4a8a258f26a6fb08e193 (patch)
treea90b08277042ab3abaa9ba16bdb2173b1319fbec
parentf10fe3ae97ade4ad73963b86c9ab2d7e4e021c61 (diff)
downloadgitlab-ce-fb998f2edf41684a4d3f4a8a258f26a6fb08e193.tar.gz
Expose CI_API_V4_URL predefined CI/CD variable
-rw-r--r--app/models/project.rb2
-rw-r--r--spec/models/ci/build_spec.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 6052febe774..d829d976afc 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1700,7 +1700,7 @@ class Project < ActiveRecord::Base
.append(key: 'CI_PROJECT_VISIBILITY', value: visibility)
.concat(container_registry_variables)
.concat(auto_devops_variables)
- # .concat(api_variables)
+ .concat(api_variables)
end
def api_variables
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 7baf4d93804..28b1a1e37e5 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -2132,6 +2132,7 @@ describe Ci::Build do
{ key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, public: true },
{ key: 'CI_PROJECT_URL', value: project.web_url, public: true },
{ key: 'CI_PROJECT_VISIBILITY', value: 'private', public: true },
+ { key: 'CI_API_V4_URL', value: 'http://localhost/api/v4', public: true },
{ key: 'CI_PIPELINE_IID', value: pipeline.iid.to_s, public: true },
{ key: 'CI_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true },
{ key: 'CI_PIPELINE_SOURCE', value: pipeline.source, public: true },