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
89471e30
Commit
89471e30
authored
Dec 25, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comparison of storage shards
parent
91c565e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
app/assets/javascripts/geo_nodes.js
app/assets/javascripts/geo_nodes.js
+0
-1
ee/app/models/geo_node_status.rb
ee/app/models/geo_node_status.rb
+1
-1
No files found.
app/assets/javascripts/geo_nodes.js
View file @
89471e30
...
...
@@ -42,7 +42,6 @@ class GeoNodeStatus {
this
.
$advancedStatus
.
on
(
'
click
'
,
GeoNodeStatus
.
toggleShowAdvancedStatus
.
bind
(
this
));
this
.
primaryVersion
=
$
(
'
.js-primary-version
'
).
text
();
this
.
primaryRevision
=
$
(
'
.js-primary-revision
'
).
text
().
replace
(
/
\W
/g
,
''
);
this
.
primaryStorageConfiguration
=
$
(
'
.primary-node
'
).
data
(
'
storageShards
'
);
this
.
statusInterval
=
new
SmartInterval
({
callback
:
this
.
getStatus
.
bind
(
this
),
...
...
ee/app/models/geo_node_status.rb
View file @
89471e30
...
...
@@ -157,7 +157,7 @@ class GeoNodeStatus < ActiveRecord::Base
def
storage_shards_match?
return
unless
Gitlab
::
Geo
.
primary?
storage_shards
.
as_json
==
StorageShard
.
all
.
as_json
storage_shards
.
as_json
==
StorageShard
Serializer
.
new
.
represent
(
StorageShard
.
all
)
.
as_json
end
def
[]
(
key
)
...
...
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