diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 18:09:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 18:09:17 +0000 |
| commit | 0eb4fd2f32e6804bc85868ba167170238e346279 (patch) | |
| tree | c020e787ea29c77e1e9f53c21940f88a87a6e905 /doc/ci | |
| parent | 78d8830cec030ff12afed3c8ae1dddec454d0a24 (diff) | |
| download | gitlab-ce-0eb4fd2f32e6804bc85868ba167170238e346279.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/caching/index.md | 10 | ||||
| -rw-r--r-- | doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md index a60310076a8..4e2e61cfadf 100644 --- a/doc/ci/caching/index.md +++ b/doc/ci/caching/index.md @@ -202,7 +202,7 @@ so they don't have to be re-fetched from the public internet. NOTE: **Note:** For more examples, check out our [GitLab CI/CD -templates](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates). +templates](https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates). ### Caching Node.js dependencies @@ -214,7 +214,7 @@ we tell npm to use `./.npm` instead, and it is cached per-branch: ```yaml # -# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/Nodejs.gitlab-ci.yml +# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/Nodejs.gitlab-ci.yml # image: node:latest @@ -241,7 +241,7 @@ are cached per-branch: ```yaml # -# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/PHP.gitlab-ci.yml +# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/PHP.gitlab-ci.yml # image: php:7.2 @@ -270,7 +270,7 @@ pip's cache is defined under `.cache/pip/` and both are cached per-branch: ```yaml # -# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/Python.gitlab-ci.yml +# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/Python.gitlab-ci.yml # image: python:latest @@ -310,7 +310,7 @@ jobs inherit it. Gems are installed in `vendor/ruby/` and are cached per-branch: ```yaml # -# https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/templates/Ruby.gitlab-ci.yml +# https://gitlab.com/gitlab-org/gitlab/tree/master/lib/gitlab/ci/templates/Ruby.gitlab-ci.yml # image: ruby:2.6 diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md index 6dbc8f98247..ca980bb58c3 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md @@ -45,7 +45,7 @@ In addition, pipelines for merged results have the following limitations: see [#11934](https://gitlab.com/gitlab-org/gitlab/issues/11934). - This feature is not available for [fast forward merges](../../../user/project/merge_requests/fast_forward_merge.md) yet. - To follow progress, see [#58226](https://gitlab.com/gitlab-org/gitlab-foss/issues/58226). + To follow progress, see [#58226](https://gitlab.com/gitlab-org/gitlab/-/issues/26996). ## Enabling Pipelines for Merged Results |