summaryrefslogtreecommitdiff
path: root/doc/ci/pipelines/pipeline_architectures.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 03:09:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 03:09:28 +0000
commitcfd62c3a3ebbc85f5787c103bfa6de1997ab8e11 (patch)
treeb58e9f69932001493b95751f593c237b4d222e10 /doc/ci/pipelines/pipeline_architectures.md
parent545bf30c7ca74d5252cdbadc6437cd494b10ed6a (diff)
downloadgitlab-ce-cfd62c3a3ebbc85f5787c103bfa6de1997ab8e11.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/pipelines/pipeline_architectures.md')
-rw-r--r--doc/ci/pipelines/pipeline_architectures.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/pipelines/pipeline_architectures.md b/doc/ci/pipelines/pipeline_architectures.md
index 803d0130cf0..4872e2595f9 100644
--- a/doc/ci/pipelines/pipeline_architectures.md
+++ b/doc/ci/pipelines/pipeline_architectures.md
@@ -11,7 +11,7 @@ There are three main ways to structure your pipelines, each with their
own advantages. These methods can be mixed and matched if needed:
- [Basic](#basic-pipelines): Good for straightforward projects where all the configuration is in one easy to find place.
-- [Directed Acylic Graph](#directed-acyclic-graph-pipelines): Good for large, complex projects that need efficient execution.
+- [Directed Acyclic Graph](#directed-acyclic-graph-pipelines): Good for large, complex projects that need efficient execution.
- [Child/Parent Pipelines](#child--parent-pipelines): Good for monorepos and projects with lots of independently defined components.
For more details about
@@ -92,7 +92,7 @@ deploy_b:
## Directed Acyclic Graph Pipelines
If efficiency is important to you and you want everything to run as quickly as possible,
-you can use [Directed Acylic Graphs (DAG)](../directed_acyclic_graph/index.md). Use the
+you can use [Directed Acyclic Graphs (DAG)](../directed_acyclic_graph/index.md). Use the
[`needs` keyword](../yaml/README.md#needs) to define dependency relationships between
your jobs. When GitLab knows the relationships between your jobs, it can run everything
as fast as possible, and even skips into subsequent stages when possible.