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
d71193a0
Commit
d71193a0
authored
Feb 23, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show Runner's description on job's page
parent
f5524d55
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/jobs/components/sidebar_details_block.vue
...ets/javascripts/jobs/components/sidebar_details_block.vue
+1
-1
spec/javascripts/jobs/sidebar_details_block_spec.js
spec/javascripts/jobs/sidebar_details_block_spec.js
+1
-1
No files found.
app/assets/javascripts/jobs/components/sidebar_details_block.vue
View file @
d71193a0
...
@@ -45,7 +45,7 @@ export default {
...
@@ -45,7 +45,7 @@ export default {
return
timeIntervalInWords
(
this
.
job
.
queued
);
return
timeIntervalInWords
(
this
.
job
.
queued
);
},
},
runnerId
()
{
runnerId
()
{
return
`
#
${
this
.
job
.
runner
.
id
}
`
;
return
`
${
this
.
job
.
runner
.
description
}
(#
${
this
.
job
.
runner
.
id
}
)
`
;
},
},
retryButtonClass
()
{
retryButtonClass
()
{
let
className
=
'
js-retry-button pull-right btn btn-retry visible-md-block visible-lg-block
'
;
let
className
=
'
js-retry-button pull-right btn btn-retry visible-md-block visible-lg-block
'
;
...
...
spec/javascripts/jobs/sidebar_details_block_spec.js
View file @
d71193a0
...
@@ -102,7 +102,7 @@ describe('Sidebar details block', () => {
...
@@ -102,7 +102,7 @@ describe('Sidebar details block', () => {
});
});
it
(
'
should render runner ID
'
,
()
=>
{
it
(
'
should render runner ID
'
,
()
=>
{
expect
(
trimWhitespace
(
vm
.
$el
.
querySelector
(
'
.js-job-runner
'
))).
toEqual
(
'
Runner:
#1
'
);
expect
(
trimWhitespace
(
vm
.
$el
.
querySelector
(
'
.js-job-runner
'
))).
toEqual
(
'
Runner:
local ci runner (#1)
'
);
});
});
it
(
'
should render timeout information
'
,
()
=>
{
it
(
'
should render timeout information
'
,
()
=>
{
...
...
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