Commit 55580cc9 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'Externalise-strings-in-_background_jobs.html.haml' into 'master'

Externalize strings in /application_settings/_gitaly.html.haml

See merge request gitlab-org/gitlab!57976
parents 74b7b3c3 084c2ba8
......@@ -3,7 +3,7 @@
%fieldset
.form-group
= f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'label-bold'
= f.label :gitaly_timeout_default, _('Default Timeout Period'), class: 'label-bold'
= f.number_field :gitaly_timeout_default, class: 'form-control gl-form-input'
.form-text.text-muted
Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced
......@@ -12,16 +12,16 @@
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.label :gitaly_timeout_fast, _('Fast Timeout Period'), class: 'label-bold'
= f.number_field :gitaly_timeout_fast, class: 'form-control gl-form-input'
.form-text.text-muted
Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast.
If they exceed this threshold, there may be a problem with a storage shard and 'failing fast'
can help maintain the stability of the GitLab instance.
.form-group
= f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'label-bold'
= f.label :gitaly_timeout_medium, _('Medium Timeout Period'), class: 'label-bold'
= f.number_field :gitaly_timeout_medium, class: 'form-control gl-form-input'
.form-text.text-muted
Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.
= f.submit 'Save changes', class: "gl-button btn btn-confirm"
= f.submit _('Save changes'), class: "gl-button btn btn-confirm"
---
title: Externalise Strings in /application_settings/_gitaly.html.haml
merge_request: 57976
author: nuwe1
type: other
......@@ -10345,6 +10345,9 @@ msgstr ""
msgid "Default CI configuration path"
msgstr ""
msgid "Default Timeout Period"
msgstr ""
msgid "Default artifacts expiration"
msgstr ""
......@@ -13382,6 +13385,9 @@ msgstr ""
msgid "False positive"
msgstr ""
msgid "Fast Timeout Period"
msgstr ""
msgid "Fast-forward merge is not possible. Rebase the source branch onto %{targetBranch} to allow this merge request to be merged."
msgstr ""
......@@ -19673,6 +19679,9 @@ msgstr ""
msgid "Median"
msgstr ""
msgid "Medium Timeout Period"
msgstr ""
msgid "Medium vulnerabilities present"
msgstr ""
......
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