summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-05-29 04:07:54 +0000
committerEvan Read <eread@gitlab.com>2019-05-29 04:07:54 +0000
commitd90642f74086f62c74a3738b4bbe0c65abe0ffda (patch)
tree58409d3d6cb1f069a988ed2ee77175bb6b3ab214
parent54dbaba577ad28645e71080698abee55fd2797ab (diff)
parentd03538d0ce474511cef521c37f47f6f69db1d321 (diff)
downloadgitlab-ce-d90642f74086f62c74a3738b4bbe0c65abe0ffda.tar.gz
Merge branch 'patch-31' into 'master'
Correct CI_API_V4_URL CI variable name See merge request gitlab-org/gitlab-ce!28849
-rw-r--r--doc/ci/variables/README.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 67e1d316f02..d33275cae4f 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -612,8 +612,8 @@ $'\''git'\'' "checkout" "-f" "-q" "dd648b2e48ce6518303b0bb580b2ee32fadaf045"
Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-machine-1480971377-317a7d0f-digital-ocean-4gb...
++ export CI=true
++ CI=true
-++ export CI_API_V4_API_URL=https://example.com:3000/api/v4
-++ CI_API_V4_API_URL=https://example.com:3000/api/v4
+++ export CI_API_V4_URL=https://example.com:3000/api/v4
+++ CI_API_V4_URL=https://example.com:3000/api/v4
++ export CI_DEBUG_TRACE=false
++ CI_DEBUG_TRACE=false
++ export CI_COMMIT_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
@@ -652,8 +652,8 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach
++ GITLAB_CI=true
++ export CI=true
++ CI=true
-++ export CI_API_V4_API_URL=https://example.com:3000/api/v4
-++ CI_API_V4_API_URL=https://example.com:3000/api/v4
+++ export CI_API_V4_URL=https://example.com:3000/api/v4
+++ CI_API_V4_URL=https://example.com:3000/api/v4
++ export GITLAB_CI=true
++ GITLAB_CI=true
++ export CI_JOB_ID=7046507