diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:07:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:07:47 +0300 |
| commit | 6f2065c468b05658125b746169c56764a8ccddb1 (patch) | |
| tree | 544a488ae2e65e2fcfe4acce4e56623b85bbce5e /doc/administration/operations | |
| parent | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/operations')
| -rw-r--r-- | doc/administration/operations/puma.md | 2 | ||||
| -rw-r--r-- | doc/administration/operations/unicorn.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/operations/puma.md b/doc/administration/operations/puma.md index 30fea36fac6..6f252a7d76e 100644 --- a/doc/administration/operations/puma.md +++ b/doc/administration/operations/puma.md @@ -2,7 +2,7 @@ ## Puma -As of GitLab 12.9, [Puma](https://github.com/puma/puma) has replaced [Unicorn](https://bogomips.org/unicorn/). +As of GitLab 12.9, [Puma](https://github.com/puma/puma) has replaced [Unicorn](https://yhbt.net/unicorn/). as the default web server. ## Why switch to Puma? diff --git a/doc/administration/operations/unicorn.md b/doc/administration/operations/unicorn.md index bab20a76546..bb817e71f5a 100644 --- a/doc/administration/operations/unicorn.md +++ b/doc/administration/operations/unicorn.md @@ -2,7 +2,7 @@ ## Unicorn -GitLab uses [Unicorn](https://bogomips.org/unicorn/), a pre-forking Ruby web +GitLab uses [Unicorn](https://yhbt.net/unicorn/), a pre-forking Ruby web server, to handle web requests (web browsers and Git HTTP clients). Unicorn is a daemon written in Ruby and C that can load and run a Ruby on Rails application; in our case the Rails application is GitLab Community Edition or |