Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
084c2ba8
Commit
084c2ba8
authored
Apr 20, 2021
by
Marvin Karegyeya
Committed by
Rémy Coutable
Apr 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Externalize strings in /application_settings/_gitaly.html.haml
parent
07520c05
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
4 deletions
+18
-4
app/views/admin/application_settings/_gitaly.html.haml
app/views/admin/application_settings/_gitaly.html.haml
+4
-4
changelogs/unreleased/Externalise-strings-in-_gitaly-html-haml.yml
...s/unreleased/Externalise-strings-in-_gitaly-html-haml.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+9
-0
No files found.
app/views/admin/application_settings/_gitaly.html.haml
View file @
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"
changelogs/unreleased/Externalise-strings-in-_gitaly-html-haml.yml
0 → 100644
View file @
084c2ba8
---
title
:
Externalise Strings in /application_settings/_gitaly.html.haml
merge_request
:
57976
author
:
nuwe1
type
:
other
locale/gitlab.pot
View file @
084c2ba8
...
...
@@ -10342,6 +10342,9 @@ msgstr ""
msgid "Default CI configuration path"
msgstr ""
msgid "Default Timeout Period"
msgstr ""
msgid "Default artifacts expiration"
msgstr ""
...
...
@@ -13373,6 +13376,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 ""
...
...
@@ -19658,6 +19664,9 @@ msgstr ""
msgid "Median"
msgstr ""
msgid "Medium Timeout Period"
msgstr ""
msgid "Medium vulnerabilities present"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment