BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7a7a4356
Commit
7a7a4356
authored
May 30, 2018
by
Mayra Cabrera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moves script_failure conditional over lambda
So the 'failed' message can actually indicate if the build failed or not
parent
0bc9e0b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
job_entity.rb
app/serializers/job_entity.rb
+2
-2
No files found.
app/serializers/job_entity.rb
View file @
7a7a4356
...
...
@@ -26,7 +26,7 @@ class JobEntity < Grape::Entity
expose
:created_at
expose
:updated_at
expose
:detailed_status
,
as: :status
,
with:
StatusEntity
expose
:callout_message
,
if:
->
(
*
)
{
failed?
}
expose
:callout_message
,
if:
->
(
*
)
{
failed?
&&
!
build
.
script_failure?
}
expose
:recoverable
,
if:
->
(
*
)
{
failed?
}
private
...
...
@@ -54,7 +54,7 @@ class JobEntity < Grape::Entity
end
def
failed?
build
.
failed?
&&
!
build
.
script_failure?
build
.
failed?
end
def
callout_message
...
...
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