diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-14 09:06:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-14 09:06:20 +0000 |
commit | 4fe2bdc9b6d36a86c61bfefb7258bd99ecb7af96 (patch) | |
tree | 4e2c07548b8951b9c1646931e94a9427dd253c3c /.gitlab/ci/docs.gitlab-ci.yml | |
parent | a93dfc1b7e55b118b1cf4a67afeb46556292914c (diff) | |
download | gitlab-ce-4fe2bdc9b6d36a86c61bfefb7258bd99ecb7af96.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/docs.gitlab-ci.yml')
-rw-r--r-- | .gitlab/ci/docs.gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 3f29adddf73..22e752ae0b0 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -10,7 +10,7 @@ environment: name: review-docs/$CI_COMMIT_REF_SLUG # DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables - # Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693 + # Discussion: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/14236/diffs#note_40140693 url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX on_stop: review-docs-cleanup before_script: @@ -31,8 +31,8 @@ review-docs-deploy-manual: - ./trigger-build-docs deploy when: manual only: - - branches@gitlab-org/gitlab-ce - - branches@gitlab-org/gitlab-ee + - branches@gitlab-org/gitlab-foss + - branches@gitlab-org/gitlab # Always trigger a docs build in gitlab-docs only on docs-only branches. # Useful to preview the docs changes live. @@ -44,8 +44,8 @@ review-docs-deploy: - gem install gitlab --no-document - ./trigger-build-docs deploy only: - - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ce - - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ee + - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-foss + - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab # Cleanup remote environment of gitlab-docs review-docs-cleanup: @@ -60,8 +60,8 @@ review-docs-cleanup: - ./trigger-build-docs cleanup when: manual only: - - branches@gitlab-org/gitlab-ce - - branches@gitlab-org/gitlab-ee + - branches@gitlab-org/gitlab-foss + - branches@gitlab-org/gitlab docs lint: extends: |