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
d6ddd73d
Commit
d6ddd73d
authored
Nov 15, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix karma failures
parent
7720f498
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/geo_nodes.js
app/assets/javascripts/geo_nodes.js
+3
-2
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality.vue
...erge_request_widget/components/mr_widget_code_quality.vue
+2
-2
No files found.
app/assets/javascripts/geo_nodes.js
View file @
d6ddd73d
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
import
axios
from
'
axios
'
;
import
axios
from
'
axios
'
;
import
SmartInterval
from
'
~/smart_interval
'
;
import
SmartInterval
from
'
~/smart_interval
'
;
import
{
parseSeconds
,
stringifyTime
}
from
'
./lib/utils/pretty_time
'
;
import
{
parseSeconds
,
stringifyTime
}
from
'
./lib/utils/pretty_time
'
;
import
{
addDelimiter
}
from
'
./lib/utils/text_utility
'
;
const
healthyClass
=
'
geo-node-healthy
'
;
const
healthyClass
=
'
geo-node-healthy
'
;
const
unhealthyClass
=
'
geo-node-unhealthy
'
;
const
unhealthyClass
=
'
geo-node-unhealthy
'
;
...
@@ -52,7 +53,7 @@ class GeoNodeStatus {
...
@@ -52,7 +53,7 @@ class GeoNodeStatus {
static
formatCountAndPercentage
(
count
,
total
,
percentage
)
{
static
formatCountAndPercentage
(
count
,
total
,
percentage
)
{
if
(
count
!==
null
||
total
!=
null
)
{
if
(
count
!==
null
||
total
!=
null
)
{
return
`
${
gl
.
text
.
addDelimiter
(
count
)}
/
${
gl
.
text
.
addDelimiter
(
total
)}
(
${
percentage
}
)`
;
return
`
${
addDelimiter
(
count
)}
/
${
addDelimiter
(
total
)}
(
${
percentage
}
)`
;
}
}
return
notAvailable
;
return
notAvailable
;
...
@@ -60,7 +61,7 @@ class GeoNodeStatus {
...
@@ -60,7 +61,7 @@ class GeoNodeStatus {
static
formatCount
(
count
)
{
static
formatCount
(
count
)
{
if
(
count
!==
null
)
{
if
(
count
!==
null
)
{
return
gl
.
text
.
addDelimiter
(
count
);
return
addDelimiter
(
count
);
}
}
return
notAvailable
;
return
notAvailable
;
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality.vue
View file @
d6ddd73d
<
script
>
<
script
>
import
statusIcon
from
'
~/vue_merge_request_widget/components/mr_widget_status_icon
'
;
import
statusIcon
from
'
~/vue_merge_request_widget/components/mr_widget_status_icon
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
'
~/lib/utils/text_utility
'
;
import
{
pluralize
}
from
'
~/lib/utils/text_utility
'
;
import
issuesBlock
from
'
./mr_widget_code_quality_issues.vue
'
;
import
issuesBlock
from
'
./mr_widget_code_quality_issues.vue
'
;
export
default
{
export
default
{
...
@@ -90,7 +90,7 @@ export default {
...
@@ -90,7 +90,7 @@ export default {
methods
:
{
methods
:
{
pointsText
(
issues
)
{
pointsText
(
issues
)
{
return
gl
.
text
.
pluralize
(
'
point
'
,
issues
.
length
);
return
pluralize
(
'
point
'
,
issues
.
length
);
},
},
toggleCollapsed
()
{
toggleCollapsed
()
{
...
...
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