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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
11204398
Commit
11204398
authored
Apr 03, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sidebar_details_block.vue and simplify build_metadata_entity.rb
parent
964933c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
app/assets/javascripts/jobs/components/sidebar_details_block.vue
...ets/javascripts/jobs/components/sidebar_details_block.vue
+1
-1
app/serializers/build_metadata_entity.rb
app/serializers/build_metadata_entity.rb
+1
-4
No files found.
app/assets/javascripts/jobs/components/sidebar_details_block.vue
View file @
11204398
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
return
`#
${
this
.
job
.
runner
.
id
}
`
;
return
`#
${
this
.
job
.
runner
.
id
}
`
;
},
},
hasTimeout
()
{
hasTimeout
()
{
return
this
.
job
.
metadata
!=
null
&&
this
.
job
.
metadata
.
timeout_human_readable
!==
''
;
return
this
.
job
.
metadata
!=
null
&&
this
.
job
.
metadata
.
timeout_human_readable
!==
null
;
},
},
timeout
()
{
timeout
()
{
if
(
this
.
job
.
metadata
==
null
)
{
if
(
this
.
job
.
metadata
==
null
)
{
...
...
app/serializers/build_metadata_entity.rb
View file @
11204398
class
BuildMetadataEntity
<
Grape
::
Entity
class
BuildMetadataEntity
<
Grape
::
Entity
expose
:timeout_human_readable
do
|
metadata
|
expose
:timeout_human_readable
metadata
.
timeout_human_readable
unless
metadata
.
timeout
.
nil?
end
expose
:timeout_source
do
|
metadata
|
expose
:timeout_source
do
|
metadata
|
metadata
.
present
.
timeout_source
metadata
.
present
.
timeout_source
end
end
...
...
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