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
c245ffeb
Commit
c245ffeb
authored
Aug 12, 2019
by
Gabriel Mazetto
Committed by
Michael Kozono
Aug 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve wording on object storage replication description
parent
7422581a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/views/admin/geo/nodes/_form.html.haml
ee/app/views/admin/geo/nodes/_form.html.haml
+2
-2
ee/lib/api/geo_nodes.rb
ee/lib/api/geo_nodes.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+2
-2
No files found.
ee/app/views/admin/geo/nodes/_form.html.haml
View file @
c245ffeb
...
@@ -77,6 +77,6 @@
...
@@ -77,6 +77,6 @@
.form-check
.form-check
=
form
.
check_box
:sync_object_storage
,
class:
'form-check-input'
=
form
.
check_box
:sync_object_storage
,
class:
'form-check-input'
=
form
.
label
:sync_object_storage
,
class:
'form-check-label'
do
=
form
.
label
:sync_object_storage
,
class:
'form-check-label'
do
%span
=
s_
(
'Geo|Allow
GitLab
to replicate content on Object Storage'
)
%span
=
s_
(
'Geo|Allow
this secondary node
to replicate content on Object Storage'
)
.form-text.text-muted
=
s_
(
'Geo|If enabled, GitLab will
perform
Object Storage replication using Geo'
)
.form-text.text-muted
=
s_
(
'Geo|If enabled, GitLab will
handle
Object Storage replication using Geo'
)
ee/lib/api/geo_nodes.rb
View file @
c245ffeb
...
@@ -147,7 +147,7 @@ module API
...
@@ -147,7 +147,7 @@ module API
optional
:repos_max_capacity
,
type:
Integer
,
desc:
'Control the maximum concurrency of repository backfill for this secondary node'
optional
:repos_max_capacity
,
type:
Integer
,
desc:
'Control the maximum concurrency of repository backfill for this secondary node'
optional
:verification_max_capacity
,
type:
Integer
,
desc:
'Control the maximum concurrency of repository verification for this node'
optional
:verification_max_capacity
,
type:
Integer
,
desc:
'Control the maximum concurrency of repository verification for this node'
optional
:container_repositories_max_capacity
,
type:
Integer
,
desc:
'Control the maximum concurrency of container repository sync for this node'
optional
:container_repositories_max_capacity
,
type:
Integer
,
desc:
'Control the maximum concurrency of container repository sync for this node'
optional
:sync_object_storage
,
type:
Boolean
,
desc:
'Flag indicating if the secondary Geo node will handle replication for blobs
on the
Object Storage'
optional
:sync_object_storage
,
type:
Boolean
,
desc:
'Flag indicating if the secondary Geo node will handle replication for blobs
in
Object Storage'
end
end
put
do
put
do
not_found!
(
'GeoNode'
)
unless
geo_node
not_found!
(
'GeoNode'
)
unless
geo_node
...
...
locale/gitlab.pot
View file @
c245ffeb
...
@@ -6814,7 +6814,7 @@ msgstr ""
...
@@ -6814,7 +6814,7 @@ msgstr ""
msgid "Geo|All projects are being scheduled for re-verify"
msgid "Geo|All projects are being scheduled for re-verify"
msgstr ""
msgstr ""
msgid "Geo|Allow
GitLab
to replicate content on Object Storage"
msgid "Geo|Allow
this secondary node
to replicate content on Object Storage"
msgstr ""
msgstr ""
msgid "Geo|Batch operations"
msgid "Geo|Batch operations"
...
@@ -6856,7 +6856,7 @@ msgstr ""
...
@@ -6856,7 +6856,7 @@ msgstr ""
msgid "Geo|Groups to synchronize"
msgid "Geo|Groups to synchronize"
msgstr ""
msgstr ""
msgid "Geo|If enabled, GitLab will
perform
Object Storage replication using Geo"
msgid "Geo|If enabled, GitLab will
handle
Object Storage replication using Geo"
msgstr ""
msgstr ""
msgid "Geo|In sync"
msgid "Geo|In sync"
...
...
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