summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-05-08 14:37:12 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-05-08 14:37:12 +0000
commite972ebac636555d959021be0fc1979ebf36e4be5 (patch)
treee5e1be50abc1146ac0eb9469834aaf3526c2355c
parentc5100c38a681d1564a4b6293613917ea6eda9c1c (diff)
parent354968a68b78245221cd1021ad5deb72a0ac458d (diff)
downloadgitlab-ce-e972ebac636555d959021be0fc1979ebf36e4be5.tar.gz
Merge branch 'patch-37' into 'master'
fix doc link issues See merge request gitlab-org/gitlab-ce!28166
-rw-r--r--doc/install/requirements.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 672723aaf12..f6a52205a0e 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -169,7 +169,7 @@ So for a machine with 2 cores, 3 unicorn workers is ideal.
For all machines that have 2GB and up we recommend a minimum of three unicorn workers.
If you have a 1GB machine we recommend to configure only two Unicorn workers to prevent excessive swapping.
-To change the Unicorn workers when you have the Omnibus package (which defaults to the recommendation above) please see [the Unicorn settings in the Omnibus GitLab documentation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/unicorn.md#unicorn-settings).
+To change the Unicorn workers when you have the Omnibus package (which defaults to the recommendation above) please see [the Unicorn settings in the Omnibus GitLab documentation](https://docs.gitlab.com/omnibus/settings/unicorn.html).
## Redis and Sidekiq
@@ -201,14 +201,13 @@ you decide to run GitLab Runner and the GitLab Rails application on the same
machine.
It is also not safe to install everything on a single machine, because of the
-[security reasons] - especially when you plan to use shell executor with GitLab
+[security reasons](https://docs.gitlab.com/runner/security/)
+- especially when you plan to use shell executor with GitLab
Runner.
We recommend using a separate machine for each GitLab Runner, if you plan to
use the CI features.
-[security reasons]: https://gitlab.com/gitlab-org/gitlab-runner/blob/master/docs/security/index.md
-
## Supported web browsers
We support the current and the previous major release of: