summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 21:08:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 21:08:01 +0000
commit95ad46159e4cd93f2b31838199180d824e041994 (patch)
treed41880d3b6a0093463694978590e590efb08caef /doc/ci
parent2c72daf2f1744f2b8c8c6674c266907e9ef55558 (diff)
downloadgitlab-ce-95ad46159e4cd93f2b31838199180d824e041994.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/enable_or_disable_ci.md2
-rw-r--r--doc/ci/variables/README.md6
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/enable_or_disable_ci.md b/doc/ci/enable_or_disable_ci.md
index 732b4676c56..12ed41e81ee 100644
--- a/doc/ci/enable_or_disable_ci.md
+++ b/doc/ci/enable_or_disable_ci.md
@@ -30,7 +30,7 @@ either:
NOTE: **Note:**
This only applies to pipelines run as part of GitLab CI/CD. This will not enable or disable
-pipelines that are run from an [external integration](../user/project/integrations/project_services.md#services).
+pipelines that are run from an [external integration](../user/project/integrations/overview.md#integrations-listing).
## Per-project user setting
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 831669b6f6b..1ec4c154039 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -435,13 +435,13 @@ To learn more about about scoping environments, see [Scoping environments with s
> Introduced in GitLab 8.15.
-[Project services](../../user/project/integrations/project_services.md) that are
+[Integrations](../../user/project/integrations/overview.md) that are
responsible for deployment configuration may define their own variables that
are set in the build environment. These variables are only defined for
[deployment jobs](../environments.md). Please consult the documentation of
-the project services that you are using to learn which variables they define.
+the integrations that you are using to learn which variables they define.
-An example project service that defines deployment variables is the
+An example integration that defines deployment variables is the
[Kubernetes integration](../../user/project/clusters/index.md#deployment-variables).
### Auto DevOps environment variables