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:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-01-07 12:10:46 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-01-07 12:10:46 +0300
commita8e23bd1b5029fb04ecb22f9c60fe7a8f9d45091 (patch)
tree42d6e3bb2747583a8bcf38f498a28d4a1e6f969b /doc/ci/enable_or_disable_ci.md
parent12e32224c17253f9616cd05d0bce806881fa8db9 (diff)
Fix hyphenation typos [ci skip]
Diffstat (limited to 'doc/ci/enable_or_disable_ci.md')
-rw-r--r--doc/ci/enable_or_disable_ci.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/ci/enable_or_disable_ci.md b/doc/ci/enable_or_disable_ci.md
index 2803bb5f34a..9bd2f5aff22 100644
--- a/doc/ci/enable_or_disable_ci.md
+++ b/doc/ci/enable_or_disable_ci.md
@@ -17,11 +17,11 @@ In fact, the `/builds` page can still be accessed, although it's hidden from
the left sidebar menu.
GitLab CI is enabled by default on new installations and can be disabled either
-individually under each project's settings, or site wide by modifying the
+individually under each project's settings, or site-wide by modifying the
settings in `gitlab.yml` and `gitlab.rb` for source and Omnibus installations
respectively.
-### Per project user setting
+### Per-project user setting
The setting to enable or disable GitLab CI can be found with the name **Builds**
under the **Features** area of a project's settings along with **Issues**,
@@ -32,15 +32,15 @@ and hit **Save** for the settings to take effect.
---
-### Site wide administrator setting
+### Site-wide administrator setting
-You can disable GitLab CI site wide, by modifying the settings in `gitlab.yml`
+You can disable GitLab CI site-wide, by modifying the settings in `gitlab.yml`
and `gitlab.rb` for source and Omnibus installations respectively.
-Two things to note.
+Two things to note:
-1. Disabling GitLab CI, will affect only newly created projects. Projects that
- had it enabled prior this modification, will work as before.
+1. Disabling GitLab CI, will affect only newly-created projects. Projects that
+ had it enabled prior to this modification, will work as before.
1. Even if you disable GitLab CI, users will still be able to enable it in the
project's settings.