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
448a9d89
Commit
448a9d89
authored
Dec 25, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bugs with parsing storage shards
parent
3a8d1ddc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/geo_nodes.js
app/assets/javascripts/geo_nodes.js
+1
-1
app/models/storage_shard.rb
app/models/storage_shard.rb
+1
-1
No files found.
app/assets/javascripts/geo_nodes.js
View file @
448a9d89
...
...
@@ -215,7 +215,7 @@ class GeoNodeStatus {
this
.
$secondaryVersion
.
text
(
`
${
status
.
version
}
(
${
status
.
revision
}
) -
${
versionMismatch
}
`
);
}
if
(
!
status
.
storage_shards_match
)
{
if
(
status
.
storage_shards_match
===
null
)
{
this
.
$secondaryStorage
.
text
(
'
UNKNOWN
'
);
}
else
if
(
status
.
storage_shards_match
)
{
this
.
$secondaryStorage
.
removeClass
(
`
${
storageMismatchClass
}
`
);
...
...
app/models/storage_shard.rb
View file @
448a9d89
...
...
@@ -19,7 +19,7 @@ class StorageShard
def
self
.
all
Settings
.
repositories
.
storages
.
map
do
|
name
,
params
|
config
=
params
.
symbolize_keys
.
merge
(
name:
name
)
config
.
slice!
(
allowed_params
)
config
.
slice!
(
*
allowed_params
)
StorageShard
.
new
(
config
)
end
end
...
...
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