diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-18 09:43:45 -0400 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-18 09:43:45 -0400 |
commit | 39c2677e862b3165a203239ce7fd829d5586392a (patch) | |
tree | 93af6f6b5273dbbae9481607e279b6351693b094 /doc | |
parent | 63bd1f92d96c9d023723a78259be3c86846e30a5 (diff) | |
parent | 2b8fc1387b97dc8ae7857458cc61c6f7a21f6d54 (diff) | |
download | gitlab-ce-39c2677e862b3165a203239ce7fd829d5586392a.tar.gz |
Merge remote-tracking branch 'origin/master' into after-script
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/quick_start/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md index 9aba4326e11..6a42a935abd 100644 --- a/doc/ci/quick_start/README.md +++ b/doc/ci/quick_start/README.md @@ -13,7 +13,7 @@ GitLab offers a [continuous integration][ci] service. If you and configure your GitLab project to use a [Runner], then each merge request or push triggers a build. -The `.gitlab-ci.yml` file tells the GitLab runner what do to. By default it +The `.gitlab-ci.yml` file tells the GitLab runner what to do. By default it runs three [stages]: `build`, `test`, and `deploy`. If everything runs OK (no non-zero return values), you'll get a nice green |