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
d6e2af85
Commit
d6e2af85
authored
Aug 13, 2019
by
Gabriel Mazetto
Committed by
Michael Kozono
Aug 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove validation on sync_object_storage as it added undesired effects
parent
c245ffeb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
8 deletions
+0
-8
ee/app/models/geo_node.rb
ee/app/models/geo_node.rb
+0
-1
ee/spec/models/geo_node_spec.rb
ee/spec/models/geo_node_spec.rb
+0
-7
No files found.
ee/app/models/geo_node.rb
View file @
d6e2af85
...
...
@@ -22,7 +22,6 @@ class GeoNode < ApplicationRecord
validates
:primary
,
uniqueness:
{
message:
'node already exists'
},
if: :primary
validates
:enabled
,
if: :primary
,
acceptance:
{
message:
'Geo primary node cannot be disabled'
}
validates
:sync_object_storage
,
if: :primary
,
inclusion:
{
in:
[
false
],
message:
'Geo primary node doesnt use sync_object_storage value'
}
validates
:access_key
,
presence:
true
validates
:encrypted_secret_access_key
,
presence:
true
...
...
ee/spec/models/geo_node_spec.rb
View file @
d6e2af85
...
...
@@ -43,13 +43,6 @@ describe GeoNode, :geo, type: :model do
expect
(
primary_node
).
not_to
be_valid
expect
(
primary_node
.
errors
).
to
include
(
:enabled
)
end
it
'requires sync_object_storage to be disabled'
do
primary_node
.
sync_object_storage
=
true
expect
(
primary_node
).
not_to
be_valid
expect
(
primary_node
.
errors
).
to
include
(
:sync_object_storage
)
end
end
context
'when validating url'
do
...
...
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