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
ca77cd7b
Commit
ca77cd7b
authored
Mar 10, 2020
by
mfluharty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep failedOrErrored instead of failed || errored
parent
ddb084ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/assets/javascripts/reports/store/utils.js
app/assets/javascripts/reports/store/utils.js
+2
-1
No files found.
app/assets/javascripts/reports/store/utils.js
View file @
ca77cd7b
...
...
@@ -10,6 +10,7 @@ import {
const
textBuilder
=
results
=>
{
const
{
failed
,
errored
,
resolved
,
total
}
=
results
;
const
failedOrErrored
=
(
failed
||
0
)
+
(
errored
||
0
);
const
failedString
=
failed
?
n__
(
'
%d failed
'
,
'
%d failed
'
,
failed
)
:
null
;
const
erroredString
=
errored
?
n__
(
'
%d error
'
,
'
%d errors
'
,
errored
)
:
null
;
const
combinedString
=
...
...
@@ -21,7 +22,7 @@ const textBuilder = results => {
let
resultsString
=
s__
(
'
Reports|no changed test results
'
);
if
(
failed
||
e
rrored
)
{
if
(
failed
OrE
rrored
)
{
if
(
resolved
)
{
resultsString
=
sprintf
(
s__
(
'
Reports|%{combinedString} and %{resolvedString}
'
),
{
combinedString
,
...
...
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