diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 18:07:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 18:07:53 +0300 |
| commit | a5ab3467a705b62911feacc3cf627fdbb00aa198 (patch) | |
| tree | 65143ce13405efccb922fc428624ad57c38b6efa /app/views/admin/application_settings/_gitaly.html.haml | |
| parent | eb30dd6e28f6fc9eb8021d205f6ed84511f001e2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/application_settings/_gitaly.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/_gitaly.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml index 1da02de0461..fac2de8811f 100644 --- a/app/views/admin/application_settings/_gitaly.html.haml +++ b/app/views/admin/application_settings/_gitaly.html.haml @@ -8,6 +8,9 @@ .form-text.text-muted Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced for git fetch/push operations or Sidekiq jobs. + This timeout should be less than the worker timeout. If a Gitaly call timeout would exceed the + worker timeout, the remaining time from the worker timeout would be used to avoid having to terminate + the worker. .form-group = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'label-bold' = f.number_field :gitaly_timeout_fast, class: 'form-control' |