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
f4e9be82
Commit
f4e9be82
authored
Sep 01, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Geo node JavaScript calls from html() -> text()
parent
7afe7c82
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/geo_nodes.js
app/assets/javascripts/geo_nodes.js
+9
-9
No files found.
app/assets/javascripts/geo_nodes.js
View file @
f4e9be82
...
@@ -58,16 +58,16 @@ class GeoNodeStatus {
...
@@ -58,16 +58,16 @@ class GeoNodeStatus {
this
.
$dbReplicationLag
.
text
(
'
UNKNOWN
'
);
this
.
$dbReplicationLag
.
text
(
'
UNKNOWN
'
);
}
}
this
.
$repositoriesSynced
.
html
(
`
${
status
.
repositories_synced_count
}
/
${
status
.
repositories_count
}
(
${
status
.
repositories_synced_in_percentage
}
)`
);
this
.
$repositoriesSynced
.
text
(
`
${
status
.
repositories_synced_count
}
/
${
status
.
repositories_count
}
(
${
status
.
repositories_synced_in_percentage
}
)`
);
this
.
$repositoriesFailed
.
html
(
status
.
repositories_failed_count
);
this
.
$repositoriesFailed
.
text
(
status
.
repositories_failed_count
);
this
.
$lfsObjectsSynced
.
html
(
`
${
status
.
lfs_objects_synced_count
}
/
${
status
.
lfs_objects_count
}
(
${
status
.
lfs_objects_synced_in_percentage
}
)`
);
this
.
$lfsObjectsSynced
.
text
(
`
${
status
.
lfs_objects_synced_count
}
/
${
status
.
lfs_objects_count
}
(
${
status
.
lfs_objects_synced_in_percentage
}
)`
);
this
.
$attachmentsSynced
.
html
(
`
${
status
.
attachments_synced_count
}
/
${
status
.
attachments_count
}
(
${
status
.
attachments_synced_in_percentage
}
)`
);
this
.
$attachmentsSynced
.
text
(
`
${
status
.
attachments_synced_count
}
/
${
status
.
attachments_count
}
(
${
status
.
attachments_synced_in_percentage
}
)`
);
const
eventDate
=
gl
.
utils
.
formatDate
(
new
Date
(
status
.
last_event_date
));
const
eventDate
=
gl
.
utils
.
formatDate
(
new
Date
(
status
.
last_event_date
));
const
cursorDate
=
gl
.
utils
.
formatDate
(
new
Date
(
status
.
cursor_last_event_date
));
const
cursorDate
=
gl
.
utils
.
formatDate
(
new
Date
(
status
.
cursor_last_event_date
));
this
.
$lastEventSeen
.
html
(
`
${
status
.
last_event_id
}
(
${
eventDate
}
)`
);
this
.
$lastEventSeen
.
text
(
`
${
status
.
last_event_id
}
(
${
eventDate
}
)`
);
this
.
$lastCursorEvent
.
html
(
`
${
status
.
cursor_last_event_id
}
(
${
cursorDate
}
)`
);
this
.
$lastCursorEvent
.
text
(
`
${
status
.
cursor_last_event_id
}
(
${
cursorDate
}
)`
);
if
(
status
.
health
===
'
Healthy
'
)
{
if
(
status
.
health
===
'
Healthy
'
)
{
this
.
$health
.
html
(
''
);
this
.
$health
.
text
(
''
);
}
else
{
}
else
{
const
strippedData
=
$
(
'
<div>
'
).
html
(
`
${
status
.
health
}
`
).
text
();
const
strippedData
=
$
(
'
<div>
'
).
html
(
`
${
status
.
health
}
`
).
text
();
this
.
$health
.
html
(
`<code class="geo-health">
${
strippedData
}
</code>`
);
this
.
$health
.
html
(
`<code class="geo-health">
${
strippedData
}
</code>`
);
...
@@ -96,11 +96,11 @@ class GeoNodeStatus {
...
@@ -96,11 +96,11 @@ class GeoNodeStatus {
if
(
healthy
)
{
if
(
healthy
)
{
this
.
$healthStatus
.
removeClass
(
unhealthyClass
)
this
.
$healthStatus
.
removeClass
(
unhealthyClass
)
.
addClass
(
healthyClass
)
.
addClass
(
healthyClass
)
.
html
(
'
Healthy
'
);
.
text
(
'
Healthy
'
);
}
else
{
}
else
{
this
.
$healthStatus
.
removeClass
(
healthyClass
)
this
.
$healthStatus
.
removeClass
(
healthyClass
)
.
addClass
(
unhealthyClass
)
.
addClass
(
unhealthyClass
)
.
html
(
'
Unhealthy
'
);
.
text
(
'
Unhealthy
'
);
}
}
}
}
}
}
...
...
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