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
7422581a
Commit
7422581a
authored
Aug 12, 2019
by
Gabriel Mazetto
Committed by
Michael Kozono
Aug 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature flag `:geo_object_storage_replication`
parent
a82f24c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
ee/app/views/admin/geo/nodes/_form.html.haml
ee/app/views/admin/geo/nodes/_form.html.haml
+9
-8
ee/lib/ee/api/entities.rb
ee/lib/ee/api/entities.rb
+1
-1
No files found.
ee/app/views/admin/geo/nodes/_form.html.haml
View file @
7422581a
...
...
@@ -70,12 +70,13 @@
=
form
.
number_field
:minimum_reverification_interval
,
class:
'form-control col-sm-2'
,
min:
1
.form-text.text-muted
=
s_
(
'Geo|Control the minimum interval in days that a repository should be reverified for this primary node'
)
.form-group.row.js-hide-if-geo-primary
{
class:
(
'hidden'
unless
geo_node
.
secondary?
)
}
.col-sm-10
=
form
.
label
:sync_object_storage
,
_
(
'Object Storage replication'
),
class:
'label-bold'
.form-check
=
form
.
check_box
:sync_object_storage
,
class:
'form-check-input'
=
form
.
label
:sync_object_storage
,
class:
'form-check-label'
do
%span
=
s_
(
'Geo|Allow GitLab to replicate content on Object Storage'
)
.form-text.text-muted
=
s_
(
'Geo|If enabled, GitLab will perform Object Storage replication using Geo'
)
-
if
::
Feature
.
enabled?
(
:geo_object_storage_replication
)
.form-group.row.js-hide-if-geo-primary
{
class:
(
'hidden'
unless
geo_node
.
secondary?
)
}
.col-sm-10
=
form
.
label
:sync_object_storage
,
_
(
'Object Storage replication'
),
class:
'label-bold'
.form-check
=
form
.
check_box
:sync_object_storage
,
class:
'form-check-input'
=
form
.
label
:sync_object_storage
,
class:
'form-check-label'
do
%span
=
s_
(
'Geo|Allow GitLab to replicate content on Object Storage'
)
.form-text.text-muted
=
s_
(
'Geo|If enabled, GitLab will perform Object Storage replication using Geo'
)
ee/lib/ee/api/entities.rb
View file @
7422581a
...
...
@@ -485,7 +485,7 @@ module EE
expose
:repos_max_capacity
expose
:verification_max_capacity
expose
:container_repositories_max_capacity
expose
:sync_object_storage
,
if:
->
(
geo_node
,
_
)
{
geo_node
.
secondary?
}
expose
:sync_object_storage
,
if:
->
(
geo_node
,
_
)
{
::
Feature
.
enabled?
(
:geo_object_storage_replication
)
&&
geo_node
.
secondary?
}
# Retained for backwards compatibility. Remove in API v5
expose
:clone_protocol
do
|
_record
,
_options
|
...
...
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