summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-11-20 12:11:52 +0000
committerRémy Coutable <remy@rymai.me>2017-11-20 12:11:52 +0000
commitfd20e79059e297060476090854c7afb36209f156 (patch)
tree5c14c921c9489665e5b62b0c25a5465e8f8d5b3e /.gitlab-ci.yml
parent419cffdb136d26f650169ef6086916883bee4a09 (diff)
parent4756720923241a9e06fcb1c47110fdcad23bb8d9 (diff)
downloadgitlab-ce-fd20e79059e297060476090854c7afb36209f156.tar.gz
Merge branch 'docs/use-slug-as-prefix-in-ci-docs-job' into 'master'
Use slug as the prefix for the docs CI job preview URL See merge request gitlab-org/gitlab-ce!15450
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19b831e9426..07969475503 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -193,7 +193,7 @@ review-docs-deploy:
name: review-docs/$CI_COMMIT_REF_NAME
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables
# Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693
- url: http://preview-$CI_COMMIT_REF_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
+ url: http://$DOCS_GITLAB_REPO_SUFFIX-$CI_COMMIT_REF_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
on_stop: review-docs-cleanup
script:
- ./trigger-build-docs deploy