summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-04-01 14:01:18 +1000
committerEvan Read <eread@gitlab.com>2019-04-01 14:01:18 +1000
commit2a4122fd88472194f349e713323c9e1138866b18 (patch)
treeac31fd5ee7ac84a3ee5cd25dd0703b5f16972823
parente08c693babaf1a774061ce2bd185946f4717e8ec (diff)
downloadgitlab-ce-docs/fix-ci-yaml-example.tar.gz
Minor fixes to exampledocs/fix-ci-yaml-example
-rw-r--r--doc/ci/merge_request_pipelines/index.md16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md
index e8953d235a7..aa805563029 100644
--- a/doc/ci/merge_request_pipelines/index.md
+++ b/doc/ci/merge_request_pipelines/index.md
@@ -30,29 +30,31 @@ build:
stage: build
script: ./build
only:
- - branches
- - tags
- - merge_requests
+ - branches
+ - tags
+ - merge_requests
test:
stage: test
script: ./test
only:
- - merge_requests
+ - merge_requests
deploy:
stage: deploy
script: ./deploy
+ only:
+ - master
```
After the merge request is updated with new commits:
- GitLab detects that changes have occurred and creates a new pipeline for the merge request.
-- The pipeline fetches the latest code from the source branch and run tests against it.
+- The pipeline fetches the latest code from the source branch and runs tests against it.
In the above example, the pipeline contains only `build` and `test` jobs.
-Since the `deploy` job doesn't have the `only: merge_requests` parameter,
-deployment jobs will not happen in the merge request.
+Because the `deploy` job doesn't have the `only: merge_requests` parameter,
+deployment jobs will not happen for merge requests.
Pipelines tagged with the **merge request** badge indicate that they were triggered
when a merge request was created or updated. For example: