summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2018-11-09 00:52:57 +0000
committerEvan Read <eread@gitlab.com>2018-11-09 00:52:57 +0000
commitad24121c34a4b6a2d0c9e8fa85dfe97cfbcf7c4a (patch)
tree1a0207282317cee31b9a4e68577057795025c160
parentab61bee378ed45ff01d74742b54149533811a204 (diff)
parent57b93281442eb95cb953b8a06bf99668681e6e3b (diff)
downloadgitlab-ce-ad24121c34a4b6a2d0c9e8fa85dfe97cfbcf7c4a.tar.gz
Merge branch 'patch-31' into 'master'
Typo fix stoping -> stopping in the CI README.md See merge request gitlab-org/gitlab-ce!22890
-rw-r--r--doc/ci/yaml/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 5cca9d86560..5deeb2b0133 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -812,7 +812,7 @@ deploy to production:
> defined, GitLab will automatically trigger a stop action when the associated
> branch is deleted.
-Closing (stoping) environments can be achieved with the `on_stop` keyword defined under
+Closing (stopping) environments can be achieved with the `on_stop` keyword defined under
`environment`. It declares a different job that runs in order to close
the environment.