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
05e263e9
Commit
05e263e9
authored
Aug 13, 2019
by
Gabriel Mazetto
Committed by
Michael Kozono
Aug 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wording of sync object storage view and documentation
parent
d6e2af85
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ee/app/views/admin/geo/nodes/_form.html.haml
ee/app/views/admin/geo/nodes/_form.html.haml
+1
-1
ee/lib/api/geo_nodes.rb
ee/lib/api/geo_nodes.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
ee/app/views/admin/geo/nodes/_form.html.haml
View file @
05e263e9
...
...
@@ -78,5 +78,5 @@
=
form
.
check_box
:sync_object_storage
,
class:
'form-check-input'
=
form
.
label
:sync_object_storage
,
class:
'form-check-label'
do
%span
=
s_
(
'Geo|Allow this secondary node to replicate content on Object Storage'
)
.form-text.text-muted
=
s_
(
'Geo|If enabled, GitLab will handle Object Storage replication using Geo'
)
.form-text.text-muted
=
s_
(
'Geo|If enabled,
and if object storage is enabled,
GitLab will handle Object Storage replication using Geo'
)
ee/lib/api/geo_nodes.rb
View file @
05e263e9
...
...
@@ -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
: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
:sync_object_storage
,
type:
Boolean
,
desc:
'Flag indicating if the secondary Geo node will
handle replication for
blobs in Object Storage'
optional
:sync_object_storage
,
type:
Boolean
,
desc:
'Flag indicating if the secondary Geo node will
replicate
blobs in Object Storage'
end
put
do
not_found!
(
'GeoNode'
)
unless
geo_node
...
...
locale/gitlab.pot
View file @
05e263e9
...
...
@@ -6856,7 +6856,7 @@ msgstr ""
msgid "Geo|Groups to synchronize"
msgstr ""
msgid "Geo|If enabled, GitLab will handle Object Storage replication using Geo"
msgid "Geo|If enabled,
and if object storage is enabled,
GitLab will handle Object Storage replication using Geo"
msgstr ""
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