Commit e972ebac authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'patch-37' into 'master'

fix doc link issues

See merge request gitlab-org/gitlab-ce!28166
parents c5100c38 354968a6
...@@ -169,7 +169,7 @@ So for a machine with 2 cores, 3 unicorn workers is ideal. ...@@ -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. 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. 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 ## Redis and Sidekiq
...@@ -201,14 +201,13 @@ you decide to run GitLab Runner and the GitLab Rails application on the same ...@@ -201,14 +201,13 @@ you decide to run GitLab Runner and the GitLab Rails application on the same
machine. machine.
It is also not safe to install everything on a single machine, because of the 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. Runner.
We recommend using a separate machine for each GitLab Runner, if you plan to We recommend using a separate machine for each GitLab Runner, if you plan to
use the CI features. use the CI features.
[security reasons]: https://gitlab.com/gitlab-org/gitlab-runner/blob/master/docs/security/index.md
## Supported web browsers ## Supported web browsers
We support the current and the previous major release of: We support the current and the previous major release of:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment