diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-02-22 23:24:20 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-22 23:24:20 +0300 |
commit | d10b43dae368dfcee9e8de881a294f20f803a419 (patch) | |
tree | 185ab3d000d074c9f6bf6bf0ab1168b9f99c0bdb | |
parent | 9871612d50e2b523097a9fd06fd5852dd5934368 (diff) | |
parent | bcea091371c3673a2b987f0b08e22a0b86bceb85 (diff) |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r-- | doc/ci/quick_start/README.md | 2 | ||||
-rw-r--r-- | doc/gitlab-basics/basicsimages/compare_branches.png (renamed from doc/gitlab-basics/basicsimages/compare_braches.png) | bin | 1624 -> 1624 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md index 07e566e3710..327c83bef72 100644 --- a/doc/ci/quick_start/README.md +++ b/doc/ci/quick_start/README.md @@ -124,7 +124,7 @@ In GitLab, Runners run the builds that you define in `.gitlab-ci.yml`. A Runner can be a virtual machine, a VPS, a bare-metal machine, a docker container or even a cluster of containers. GitLab and the Runners communicate through an API, so the only needed requirement is that the machine on which the -Runner is configured to has Internet access. +Runner is configured to have Internet access. A Runner can be specific to a certain project or serve multiple projects in GitLab. If it serves all projects it's called a _Shared Runner_. diff --git a/doc/gitlab-basics/basicsimages/compare_braches.png b/doc/gitlab-basics/basicsimages/compare_branches.png Binary files differindex 7eebaed9075..7eebaed9075 100644 --- a/doc/gitlab-basics/basicsimages/compare_braches.png +++ b/doc/gitlab-basics/basicsimages/compare_branches.png |