Commit 4df301c5 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'gitlab-com-puma-request-timeout' into 'master'

Document GitLab.com puma request timeout

See merge request gitlab-org/gitlab!43117
parents cec8e8a7 1ab3d6a6
...@@ -474,6 +474,10 @@ More information on this particular change can be found at ...@@ -474,6 +474,10 @@ More information on this particular change can be found at
of proposed changes can be found at of proposed changes can be found at
<https://gitlab.com/gitlab-com/infrastructure/-/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=database&label_name[]=change>. <https://gitlab.com/gitlab-com/infrastructure/-/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=database&label_name[]=change>.
## Puma
GitLab.com uses the default of 60 seconds for [Puma request timeouts](https://docs.gitlab.com/omnibus/settings/puma.html#worker-timeout).
## Unicorn ## Unicorn
GitLab.com adjusts the memory limits for the [unicorn-worker-killer](https://rubygems.org/gems/unicorn-worker-killer) gem. GitLab.com adjusts the memory limits for the [unicorn-worker-killer](https://rubygems.org/gems/unicorn-worker-killer) gem.
......
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