Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-22 21:08:29 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-22 21:08:29 +0300
commitd81dc2a54e28f4e6d7515545dfe0dc19d9e57816 (patch)
treeb80756d280382e93b209fd4fe5193c075ee4d292 /doc/development/cicd
parent684f0a68d56bd3aab8cb7a7e790be847feb22f71 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/cicd')
-rw-r--r--doc/development/cicd/index.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/cicd/index.md b/doc/development/cicd/index.md
index 6d4e19d8196..091a7b5112f 100644
--- a/doc/development/cicd/index.md
+++ b/doc/development/cicd/index.md
@@ -45,7 +45,7 @@ processing it, and returns any syntax or semantic errors. The `YAML Processor` c
[all the keywords](../../ci/yaml/index.md) available to structure a pipeline.
The `CreatePipelineService` receives the abstract data structure returned by the `YAML Processor`,
-which then converts it to persisted models (pipeline, stages, jobs, etc.). After that, the pipeline is ready
+which then converts it to persisted models (like pipeline, stages, and jobs). After that, the pipeline is ready
to be processed. Processing a pipeline means running the jobs in order of execution (stage or DAG)
until either one of the following:
@@ -77,7 +77,7 @@ that need to be stored. Also, a job may depend on artifacts from previous jobs i
case the runner downloads them using a dedicated API endpoint.
Artifacts are stored in object storage, while metadata is kept in the database. An important example of artifacts
-are reports (JUnit, SAST, DAST, etc.) which are parsed and rendered in the merge request.
+are reports (like JUnit, SAST, and DAST) which are parsed and rendered in the merge request.
Job status transitions are not all automated. A user may run [manual jobs](../../ci/yaml/index.md#whenmanual), cancel a pipeline, retry
specific failed jobs or the entire pipeline. Anything that