summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-09 12:44:56 +0000
committerRémy Coutable <remy@rymai.me>2017-03-09 12:44:56 +0000
commit03476ac0bc2a06f19057475d8982055c12a6c0a9 (patch)
tree69853a1ee60b6cb04eb5434e31489302ee16f014
parent1df518ff2c3a22ff6088195f4ce5725b976d716e (diff)
parentf6ba5ba87437c9b30f787797f00ce48a6aec8b06 (diff)
downloadgitlab-ce-03476ac0bc2a06f19057475d8982055c12a6c0a9.tar.gz
Merge branch 'patch-15' into 'master'
Make clear that commits trigger CI jobs in quick start guide See merge request !9805
-rw-r--r--doc/ci/quick_start/README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 2a5401ac13a..76e86f3e3c3 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -6,7 +6,7 @@ projects.
GitLab offers a [continuous integration][ci] service. If you
[add a `.gitlab-ci.yml` file][yaml] to the root directory of your repository,
-and configure your GitLab project to use a [Runner], then each merge request or
+and configure your GitLab project to use a [Runner], then each commit or
push, triggers your CI [pipeline].
The `.gitlab-ci.yml` file tells the GitLab runner what to do. By default it runs
@@ -14,8 +14,8 @@ a pipeline with three [stages]: `build`, `test`, and `deploy`. You don't need to
use all three stages; stages with no jobs are simply ignored.
If everything runs OK (no non-zero return values), you'll get a nice green
-checkmark associated with the pushed commit or merge request. This makes it
-easy to see whether a merge request caused any of the tests to fail before
+checkmark associated with the commit. This makes it
+easy to see whether a commit caused any of the tests to fail before
you even look at the code.
Most projects use GitLab's CI service to run the test suite so that